[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5756/8267] busybox: make bash a valid login shell if enabled



commit 33dd5fb96cd0754191185c01247ee9ee8587c30e
Author: Andreas Oberritter <obi opendreambox org>
Date:   Fri Apr 28 20:31:29 2017 +0200

    busybox: make bash a valid login shell if enabled
    
    Add bash to /etc/shells if busybox is built with bash applet anabled
    to fix login via dropbear.
    
    (From OE-Core rev: 86a2db0b2997fd05882ae0119ef45b1ea5411d39)
    
    Signed-off-by: Andreas Oberritter <obi opendreambox org>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/busybox/busybox.inc |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 375632d..adc6e9a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -398,6 +398,9 @@ pkg_postinst_${PN} () {
                        fi
                done
        fi
+       if grep -q "^${base_bindir}/bash$" $D${sysconfdir}/busybox.links*; then
+               grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> 
$D${sysconfdir}/shells
+       fi
 }
 
 pkg_prerm_${PN} () {
@@ -422,6 +425,12 @@ pkg_prerm_${PN} () {
        export PATH=$PATH:$tmpdir
 }
 
+pkg_postrm_${PN} () {
+       if grep -q "^${base_bindir}/bash$" $D${sysconfdir}/busybox.links* && [ ! -e $D${base_bindir}/bash ]; 
then
+               printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
+       fi
+}
+
 pkg_prerm_${PN}-syslog () {
        # remove syslog
        if test "x$D" = "x"; then


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]