summaryrefslogtreecommitdiffstats
path: root/meta/packages/initscripts
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/packages/initscripts
parent909ea433f1e5b686e20636fcdb553f6890b47f02 (diff)
downloadpoky-9b3ef75cd227db3d66d2189dc6e405dfa4aa0de1.tar.gz
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/packages/initscripts')
-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 8255038c32..c96c7b88cb 100755
--- a/meta/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/meta/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -152,14 +152,7 @@ fi
152mount -n -o remount,$rootmode / 152mount -n -o remount,$rootmode /
153if test "$rootmode" = rw 153if test "$rootmode" = rw
154then 154then
155 if test ! -L /etc/mtab 155 ln -sf /proc/mounts /dev/mtab
156 then
157 rm -f /etc/mtab~ /etc/nologin
158 : > /etc/mtab
159 fi
160 mount -f -o remount /
161 mount -f /proc
162 test "$devfs" && grep -q '^devfs /dev' /proc/mounts && mount -f "$devfs"
163fi 156fi
164 157
165: exit 0 158: exit 0
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 7fab41858b..4433d12318 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
4DEPENDS = "makedevs" 4DEPENDS = "makedevs"
5RDEPENDS = "makedevs" 5RDEPENDS = "makedevs"
6LICENSE = "GPL" 6LICENSE = "GPL"
7PR = "r103" 7PR = "r104"
8 8
9SRC_URI = "file://functions \ 9SRC_URI = "file://functions \
10 file://halt \ 10 file://halt \