diff options
Diffstat (limited to 'poky/meta/recipes-core/initscripts')
| -rw-r--r-- | poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb (renamed from poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb) | 2 | ||||
| -rwxr-xr-x | poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh | 2 | ||||
| -rwxr-xr-x | poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh | 22 |
3 files changed, 10 insertions, 16 deletions
diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb index 33977e66c..b591f412c 100644 --- a/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb +++ b/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb @@ -16,7 +16,7 @@ SECTION = "base" LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" -SRCREV = "dbd9197569c0935029acd5c9b02b84c68fd937ee" +SRCREV = "6a1860c6f5ad295af605ddf588933544e7c24ce1" SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh index a63e71b78..02f0351fc 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh @@ -74,7 +74,7 @@ test "$VERBOSE" != no && echo "Activating swap" # # Check the root filesystem. # -if test -f /fastboot || test "$rootcheck" = "no" +if test -f /fastboot || test $rootcheck = no then test $rootcheck = yes && echo "Fast boot, no filesystem check" else diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh index 2839d57cb..c719be5d9 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh @@ -19,21 +19,15 @@ test "$VERBOSE" != no && echo "Mounting local filesystems..." mount -at nonfs,nosmbfs,noncpfs 2>/dev/null - -# We might have mounted something over /run; see if -# /dev/initctl is present. Look for -# /sbin/init.sysvinit to verify that sysvinit (and -# not busybox or systemd) is installed as default init). -INITCTL="/dev/initctl" -if [ ! -p "$INITCTL" ] && [ "${INIT_SYSTEM}" = "sysvinit" ]; then - # Create new control channel - rm -f "$INITCTL" - mknod -m 600 "$INITCTL" p - - # Reopen control channel. - PID="$(pidof -s /sbin/init || echo 1)" - [ -n "$PID" ] && kill -s USR1 "$PID" +# +# We might have mounted something over /dev, see if /dev/initctl is there. +# +if test ! -p /dev/initctl +then + rm -f /dev/initctl + mknod -m 600 /dev/initctl p fi +kill -USR1 1 # # Execute swapon command again, in case we want to swap to |