[OE-core] [PATCH 1/3] initscripts: Check for the existence of /etc/default/rcS
wenzong.fan at windriver.com
wenzong.fan at windriver.com
Wed Nov 1 06:04:02 UTC 2017
From: Wenzong Fan <wenzong.fan at windriver.com>
/etc/default/rcS might be missing if the init manager is not sysvinit,
we have to check for the existence of this file before sourcing it.
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 2 +-
meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh | 2 +-
meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh | 2 +-
meta/recipes-core/initscripts/initscripts-1.0/mountall.sh | 2 +-
meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +-
meta/recipes-core/initscripts/initscripts-1.0/urandom | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index df553bc079..8f1853a667 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -8,7 +8,7 @@
# Short-Description: Misc and other.
### END INIT INFO
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
#
# Put a nologin file in /etc to prevent people from logging in before
# system startup is complete.
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
index 62869451b7..d1c4d6c017 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
@@ -8,7 +8,7 @@
# Short-Description: Check all other file systems
### END INIT INFO
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
#
# Check the rest of the filesystems.
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
index 02f0351fcb..c879f9e519 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
@@ -8,7 +8,7 @@
# Short-Description: Check to root file system.
### END INIT INFO
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
#
# Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
index c719be5d9a..94c1f1a141 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
@@ -9,7 +9,7 @@
# Description:
### END INIT INFO
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
#
# Mount local filesystems in /etc/fstab. For some reason, people
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
index 1a0328d63e..c001778e18 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
[ "$ROOTFS_READ_ONLY" = "no" ] && exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom
index af1625b5fd..e9b84a9d11 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/urandom
+++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom
@@ -15,7 +15,7 @@ test -c /dev/urandom || exit 0
RANDOM_SEED_FILE=/var/lib/urandom/random-seed
-. /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS
[ -f /etc/default/urandom ] && . /etc/default/urandom
case "$1" in
--
2.11.0
More information about the Openembedded-core
mailing list