From fb43a0277a1472dbbdea175cee1789b25c072a5f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 27 Sep 2008 16:35:04 -0300 Subject: initscripts: do /proc remount instead of mounting it --- packages/initscripts/initscripts-1.0/checkroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/initscripts') diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh index 5c1e5c6ebb..e5aa9aaf99 100755 --- a/packages/initscripts/initscripts-1.0/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/checkroot.sh @@ -208,7 +208,7 @@ then : > /etc/mtab fi mount -f -o remount / - mount -f /proc + mount -f -o remount /proc test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs" fi -- cgit v1.2.3 From 6628886e858d77a8f9f94dd3229143e144d39f0e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 31 Oct 2008 11:57:54 +0100 Subject: initscripts: only run ldconfig on boot when ld.so.conf is present --- packages/initscripts/initscripts-1.0/bootmisc.sh | 6 ++++-- packages/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/initscripts') diff --git a/packages/initscripts/initscripts-1.0/bootmisc.sh b/packages/initscripts/initscripts-1.0/bootmisc.sh index 2a40e0c410..dde1209be5 100755 --- a/packages/initscripts/initscripts-1.0/bootmisc.sh +++ b/packages/initscripts/initscripts-1.0/bootmisc.sh @@ -57,9 +57,11 @@ then fi # -# Update dynamic library cache +# Update dynamic library cache, but only if ld.so.conf is present # -/sbin/ldconfig +if [ -e /etc/ld.so.conf ] ; then + /sbin/ldconfig +fi # Set the system clock from hardware clock # If the timestamp is 1 day or more recent than the current time, diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index b1c43174e8..8daefc519d 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r109" +PR = "r110" SRC_URI = "file://functions \ file://halt \ -- cgit v1.2.3