summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-09 17:16:11 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-09 17:16:11 +0000
commit9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1 (patch)
tree44bf5f87c4fc0da1be777ac7f23b11558d1ed895 /meta
parent909ea433f1e5b686e20636fcdb553f6890b47f02 (diff)
downloadopenembedded-core-9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1.tar.gz
openembedded-core-9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1.tar.bz2
openembedded-core-9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1.tar.xz
openembedded-core-9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1.zip
initscripts: Remove mtab madness from checkroot.sh since it doesn't work with busybox mount and a symlink to proc is much easier
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4458 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/packages/initscripts/initscripts-1.0/checkroot.sh9
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
2 files changed, 2 insertions, 9 deletions
diff --git a/meta/packages/initscripts/initscripts-1.0/checkroot.sh b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
index 8255038c3..c96c7b88c 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -152,14 +152,7 @@ fi
mount -n -o remount,$rootmode /
if test "$rootmode" = rw
then
- if test ! -L /etc/mtab
- then
- rm -f /etc/mtab~ /etc/nologin
- : > /etc/mtab
- fi
- mount -f -o remount /
- mount -f /proc
- test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
+ ln -sf /proc/mounts /dev/mtab
fi
: exit 0
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 7fab41858..4433d1231 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r103"
+PR = "r104"
SRC_URI = "file://functions \
file://halt \