summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMichael Neves2013-02-28 16:49:23 +0100
committerMichael Neves2013-02-28 16:49:23 +0100
commitc3161071a3ae02bb55f01d337f36e1bad82d93b5 (patch)
tree29748284855c2987afd56d26a01e85fac0e39d0f /data
parentadd modules.* to lib/modules (diff)
downloadtm-scripts-c3161071a3ae02bb55f01d337f36e1bad82d93b5.tar.gz
tm-scripts-c3161071a3ae02bb55f01d337f36e1bad82d93b5.tar.xz
tm-scripts-c3161071a3ae02bb55f01d337f36e1bad82d93b5.zip
several init fixes
Diffstat (limited to 'data')
-rwxr-xr-xdata/stage3.1/init12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/stage3.1/init b/data/stage3.1/init
index 71100d7f..b5899337 100755
--- a/data/stage3.1/init
+++ b/data/stage3.1/init
@@ -44,8 +44,6 @@ for opts in ${KCL}; do
esac
done
-cat /proc/uptime > /mnt/tmp/runtime
-
while ps | grep -v grep | grep -q " hwinfo --gfxcard" ; do usleep 10 ; done
case $(cat /etc/hwinfo) in
@@ -83,7 +81,7 @@ grep modprobe /etc/netcard | grep -E "$nwcardlist" \
if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then
echo "modprobe -q virtio_net" >>/etc/modprobe.base
fi
-/bin/sh /etc/modprobe.base; mdev -s
+/bin/sh -c '/etc/modprobe.base; mdev -s'
# setup network
nwif="eth0"
@@ -91,7 +89,7 @@ nwif="eth0"
[ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
ip link set dev lo up 2>/dev/null
ip addr add 127.0.0.1/8 dev lo 2>/dev/null
-ip link set dev $nwif up 2>/dev/null || error "$init_noeth"
+ip link set dev $nwif up 2>/dev/null || echo "No link for $nwif, dropping to shell.." && setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
# analyze ip information from the kernel command line and put parts
# of it into several variables
@@ -122,12 +120,10 @@ else
noipyet="yes"
fi
-cat /proc/uptime >>/mnt/tmp/runtime
-
# load local file systems
-insmod /lib/modules/aufs.ko
-insmod /lib/modules/squashfs.ko
+modprobe aufs
+modprobe squashfs
mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
mount -n -t tmpfs none /dev/shm/uniontmp