diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-15 18:23:17 +0100 |
| commit | a25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch) | |
| tree | d8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /packages/initscripts | |
| parent | 9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff) | |
| parent | 828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff) | |
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Diffstat (limited to 'packages/initscripts')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/bootmisc.sh | 6 | ||||
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/checkroot.sh | 2 | ||||
| -rw-r--r-- | packages/initscripts/initscripts_1.0.bb | 2 |
3 files changed, 6 insertions, 4 deletions
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/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 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 \ |