<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le dim. 7 juin 2020 à 21:11, Norbert Lange <<a href="mailto:nolange79@gmail.com">nolange79@gmail.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Am So., 7. Juni 2020 um 13:07 Uhr schrieb Jérémy ROSEN <<a href="mailto:jeremy.rosen@smile.fr" target="_blank">jeremy.rosen@smile.fr</a>>:<br>
><br>
><br>
><br>
> Le sam. 6 juin 2020 à 00:59, Norbert Lange <<a href="mailto:nolange79@gmail.com" target="_blank">nolange79@gmail.com</a>> a écrit :<br>
>><br>
>> Signed-off-by: Norbert Lange <<a href="mailto:nolange79@gmail.com" target="_blank">nolange79@gmail.com</a>><br>
>> ---<br>
>> package/openssh/<a href="http://openssh.mk" rel="noreferrer" target="_blank">openssh.mk</a> | 6 +++---<br>
>> package/openssh/sshd-host-keygen.service | 2 +-<br>
>> package/openssh/sshd.socket | 11 +++++++++++<br>
>> package/openssh/sshd@.service | 10 ++++++++++<br>
>> 4 files changed, 25 insertions(+), 4 deletions(-)<br>
>> create mode 100644 package/openssh/sshd.socket<br>
>> create mode 100644 package/openssh/sshd@.service<br>
>><br>
>> diff --git a/package/openssh/<a href="http://openssh.mk" rel="noreferrer" target="_blank">openssh.mk</a> b/package/openssh/<a href="http://openssh.mk" rel="noreferrer" target="_blank">openssh.mk</a><br>
>> index 6b3ee1f5f4..1f2638e9c9 100644<br>
>> --- a/package/openssh/<a href="http://openssh.mk" rel="noreferrer" target="_blank">openssh.mk</a><br>
>> +++ b/package/openssh/<a href="http://openssh.mk" rel="noreferrer" target="_blank">openssh.mk</a><br>
>> @@ -114,9 +114,9 @@ endef<br>
>> OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS<br>
>><br>
>> define OPENSSH_INSTALL_INIT_SYSTEMD<br>
>> - mkdir $(TARGET_DIR)/usr/lib/systemd/system<br>
>> - $(INSTALL) -m 644 package/openssh/sshd*.service \<br>
>> - $(TARGET_DIR)/usr/lib/systemd/system/<br>
>> + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system<br>
>> + $(INSTALL) -m 644 package/openssh/sshd*.service package/openssh/sshd.socket \<br>
>> + $(TARGET_DIR)/usr/lib/systemd/system/.<br>
>> $(OPENSSH_INSTALL_SYSTEMD_SYSUSERS)<br>
>> endef<br>
>><br>
>> diff --git a/package/openssh/sshd-host-keygen.service b/package/openssh/sshd-host-keygen.service<br>
>> index 058e671c44..ffde622b01 100644<br>
>> --- a/package/openssh/sshd-host-keygen.service<br>
>> +++ b/package/openssh/sshd-host-keygen.service<br>
>> @@ -17,4 +17,4 @@ Type=oneshot<br>
>> RemainAfterExit=yes<br>
>><br>
>> [Install]<br>
>> -WantedBy=sshd.service<br>
>> +WantedBy=sshd.service sshd.socket<br>
>> diff --git a/package/openssh/sshd.socket b/package/openssh/sshd.socket<br>
>> new file mode 100644<br>
>> index 0000000000..bbae9ed7aa<br>
>> --- /dev/null<br>
>> +++ b/package/openssh/sshd.socket<br>
>> @@ -0,0 +1,11 @@<br>
>> +[Unit]<br>
>> +Description=OpenBSD Secure Shell server socket<br>
>> +Before=sshd.service<br>
>> +Conflicts=sshd.service<br>
><br>
> No, that would stop the socket when the service is started, and you don't want that.<br>
> If you do that, only one connection would be accepted before the socket is stoped<br>
> and since you have accept=yes no further connections would be accepted<br>
<br>
there is the singular sshd service<br>
and the sshd.socket which spawns sshd@ instance services.<br>
Those are mutually exclusive (because of the "Conflicts"), the<br>
"Before" line just ensures that the sshd.socket wins out by default.<br>
<br></blockquote><div><br></div><div>aah right, I messed up sshd.service and sshd@.service in my head.</div><div>my bad.</div><div><br></div><div>I personally think we shouldn't install both methods. </div><div>either choose a distro-wide decision or provide a config option</div><div><br></div><div>Anyway, I see what you are doing now, and that should work, AFAICT.</div><div><br></div><div>I still think that it's cool that openssh supports all those startup methods,</div><div>but I'm not convinced we need to support all of them in BR.</div><div><br></div><div>Thoughts ?</div><div><br></div><div>Regards</div><div>Jeremy <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
><br>
>><br>
>> +<br>
>> +[Socket]<br>
>> +ListenStream=22<br>
>> +Accept=yes<br>
>> +<br>
>> +[Install]<br>
>> +WantedBy=sockets.target<br>
>> diff --git a/package/openssh/sshd@.service b/package/openssh/sshd@.service<br>
>> new file mode 100644<br>
>> index 0000000000..b3a590d9a3<br>
>> --- /dev/null<br>
>> +++ b/package/openssh/sshd@.service<br>
>> @@ -0,0 +1,10 @@<br>
>> +[Unit]<br>
>> +Description=OpenBSD Secure Shell server per-connection daemon<br>
>> +Documentation=man:sshd(8) man:sshd_config(5)<br>
>> +After=auditd.service<br>
>> +<br>
>> +[Service]<br>
>> +ExecStart=-/usr/sbin/sshd -i<br>
>> +StandardInput=socket<br>
>> +RuntimeDirectory=sshd<br>
>> +RuntimeDirectoryMode=0755<br>
><br>
><br>
> I am a bit confused, you have both an ssh.service and a ssh.socket+ssh@.service<br>
> Wouldn't those two fight over port 22 ?<br>
<br>
No, on a fresh installation, the socket will be started, the sshd<br>
service will not because of the "Conflicts".<br>
if you manually enable/start the sshd.service then the socket will be<br>
shutdown first.<br>
<br>
><br>
><br>
><br>
>><br>
>> --<br>
>> 2.26.2<br>
>><br>
>> _______________________________________________<br>
>> buildroot mailing list<br>
>> <a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
>> <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailman/listinfo/buildroot</a><br>
><br>
><br>
><br>
> --<br>
><br>
><br>
> 20 rue des Jardins<br>
> 92600 Asnières-sur-Seine<br>
><br>
> Jérémy ROSEN<br>
> Architecte technique<br>
><br>
> <a href="mailto:jeremy.rosen@smile.fr" target="_blank">jeremy.rosen@smile.fr</a><br>
> +33 6 88 25 87 42<br>
> <a href="http://www.smile.eu" rel="noreferrer" target="_blank">http://www.smile.eu</a><br>
<br>
Norbert<br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><table border="0" style="border-collapse:collapse;border-spacing:0px;color:rgb(51,51,51);font-family:Raleway,regular;font-size:14px;padding:20px"><tbody><tr><td style="padding:0px 30px 0px 0px;font-size:13px;color:rgb(255,128,84);text-align:center"><a href="http://www.smile.eu/" style="background-color:transparent;color:rgb(221,72,20)" target="_blank"><img src="http://ftp.smile.fr/client/Communication/signature/img/Logo-new.png" alt="SMILE" style="border: 0px; vertical-align: middle; max-width: 100%; height: auto;"> </a><br><br><p style="margin:0px 0px 10px">20 rue des Jardins<br>92600 Asnières-sur-Seine</p></td><td style="padding:0px 0px 0px 20px;border-left:1px solid rgb(59,127,254);font-size:13px;color:rgb(255,128,84)"><div style="font-size:14px"><b>Jérémy ROSEN</b></div><div style="color:rgb(59,127,254)">Architecte technique<br></div><br><div style="color:rgb(59,127,254)"><span style="white-space:nowrap"><img src="http://ftp.smile.fr/client/Communication/signature/img/mail.png" alt="email" width="12" height="10" style="border: 0px; vertical-align: middle; margin-right: 5px;"> <a href="mailto:jeremy.rosen@smile.fr" style="background-color:transparent;color:rgb(59,127,254)" target="_blank">jeremy.rosen@smile.fr</a> </span><br><span style="white-space:nowrap"><img src="http://ftp.smile.fr/client/Communication/signature/img/phone.png" alt="phone" width="10" height="10" style="border: 0px; vertical-align: middle; margin-right: 5px;"></span> +33 6 88 25 87 42 <br><span style="white-space:nowrap"><img src="http://ftp.smile.fr/client/Communication/signature/img/web.png" alt="url" width="12" height="12" style="border: 0px; vertical-align: middle; margin-right: 5px;"> <a href="http://www.smile.eu/" style="background-color:transparent;color:rgb(59,127,254)" target="_blank">http://www.smile.eu</a></span></div><br><div><span><a href="https://twitter.com/GroupeSmile" style="background-color:transparent;color:rgb(221,72,20);margin-right:5px" target="_blank"><img src="http://ftp.smile.fr/client/Communication/signature/img/rs-twitter.png" alt="Twitter" style="border: 0px; vertical-align: middle; max-width: 100%; height: auto;"></a></span> <span><a href="https://www.facebook.com/smileopensource" style="background-color:transparent;color:rgb(221,72,20);margin-right:5px" target="_blank"><img src="http://ftp.smile.fr/client/Communication/signature/img/rs-facebook.png" alt="Facebook" style="border: 0px; vertical-align: middle; max-width: 100%; height: auto;"></a></span> <span><a href="https://www.linkedin.com/company/smile" style="background-color:transparent;color:rgb(221,72,20);margin-right:5px" target="_blank"><img src="http://ftp.smile.fr/client/Communication/signature/img/rs-linkedin.png" alt="LinkedIn" style="border: 0px; vertical-align: middle; max-width: 100%; height: auto;"></a></span> <span><a href="https://github.com/Smile-SA" style="background-color:transparent;color:rgb(221,72,20);margin-right:5px" target="_blank"><img src="http://ftp.smile.fr/client/Communication/signature/img/rs-github.png" alt="Github" style="border: 0px; vertical-align: middle; max-width: 100%; height: auto;"></a></span></div></td></tr></tbody></table><br style="color:rgb(51,51,51);font-family:Raleway,regular;font-size:14px"><div style="color:rgb(51,51,51);font-family:Raleway,regular;font-size:14px"><a href="https://www.smile.eu/fr/publications/livres-blancs/yocto?utm_source=signature&utm_medium=email&utm_campaign=signature" style="background-color:transparent;color:rgb(221,72,20)" target="_blank"><img src="https://signature.smile.eu/assets/img/bandeaux_signature_mail_yocto.gif.gif" alt="Découvrez l’univers Smile, rendez-vous sur smile.eu" border="0" style="border: 0px; vertical-align: middle;"></a></div></div></div></div></div></div>