| Message ID | 1516211058-466-3-git-send-email-romain.naour@smile.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add /etc/shells handling | expand |
Romain, All, On 2018-01-17 18:44 +0100, Romain Naour spake thusly: > When ash (busybox) is selected, /bin/{a,hu}sh is not added to /etc/shells > (see man shells). So, login tools like dropbear reject the ssh > connexions for users using {a,hu}sh as shell in /etc/passwd. > > buildroot authpriv.warn dropbear[853]: User 'kubu' has invalid shell, rejected > > Signed-off-by: Romain Naour <romain.naour@smile.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Yet, a comment, see below... > --- > v2: add double-dollar after /bin/{a,hu}sh (Yann) > add hush handling > msh has been removed from Busybox 1.28 > https://git.busybox.net/busybox/commit/?id=2e989ef232e35750df573898077dd356003705b2 > msh is unlikely used. > --- > package/busybox/busybox.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index d0bbd3f..1865306 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -258,6 +258,19 @@ define BUSYBOX_INSTALL_TELNET_SCRIPT > fi > endef > > +# Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear > +# can reject the user connexion. See man shells. > +define BUSYBOX_INSTALL_ADD_TO_SHELLS > + if grep -q CONFIG_ASH=y $(@D)/.config; then \ Idealy, I would have also ensured that the pattern is anchored to the beining (and end) of the line: if grep -qsE '^CONFIG_ASH=y$$' $(@D)/.config; then \ But in practice, I don't think it is necessary. Hence my acked-by. > + grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \ > + || echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \ > + fi > + if grep -q CONFIG_HUSH=y $(@D)/.config; then \ Ditto. Regards, Yann E. MORIN. > + grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \ > + || echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \ > + fi > +endef > + > # Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any > # full-blown versions of apps installed by other packages with sym/hard links. > define BUSYBOX_NOCLOBBER_INSTALL > @@ -291,6 +304,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS > $(BUSYBOX_INSTALL_INITTAB) > $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) > $(BUSYBOX_INSTALL_MDEV_CONF) > + $(BUSYBOX_INSTALL_ADD_TO_SHELLS) > endef > > define BUSYBOX_INSTALL_INIT_SYSV > -- > 2.7.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d0bbd3f..1865306 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -258,6 +258,19 @@ define BUSYBOX_INSTALL_TELNET_SCRIPT fi endef +# Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear +# can reject the user connexion. See man shells. +define BUSYBOX_INSTALL_ADD_TO_SHELLS + if grep -q CONFIG_ASH=y $(@D)/.config; then \ + grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \ + || echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \ + fi + if grep -q CONFIG_HUSH=y $(@D)/.config; then \ + grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \ + || echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \ + fi +endef + # Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any # full-blown versions of apps installed by other packages with sym/hard links. define BUSYBOX_NOCLOBBER_INSTALL @@ -291,6 +304,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_INITTAB) $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) $(BUSYBOX_INSTALL_MDEV_CONF) + $(BUSYBOX_INSTALL_ADD_TO_SHELLS) endef define BUSYBOX_INSTALL_INIT_SYSV
When ash (busybox) is selected, /bin/{a,hu}sh is not added to /etc/shells (see man shells). So, login tools like dropbear reject the ssh connexions for users using {a,hu}sh as shell in /etc/passwd. buildroot authpriv.warn dropbear[853]: User 'kubu' has invalid shell, rejected Signed-off-by: Romain Naour <romain.naour@smile.fr> --- v2: add double-dollar after /bin/{a,hu}sh (Yann) add hush handling msh has been removed from Busybox 1.28 https://git.busybox.net/busybox/commit/?id=2e989ef232e35750df573898077dd356003705b2 msh is unlikely used. --- package/busybox/busybox.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+)