summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-08-22 16:34:05 +0200
committerJonathan Bauer2013-08-22 16:34:05 +0200
commit5e09bdb4e204bed8635629b6812509bb03b7d59b (patch)
tree2903e760ef5d14171680866198522e2e11687fdb
parent[plymouth] moved plymouth stuff to /usr. Uses PREFIX from the config file (diff)
downloadtm-scripts-5e09bdb4e204bed8635629b6812509bb03b7d59b.tar.gz
tm-scripts-5e09bdb4e204bed8635629b6812509bb03b7d59b.tar.xz
tm-scripts-5e09bdb4e204bed8635629b6812509bb03b7d59b.zip
[rootfs-stage31] start plymouth later
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init20
1 files changed, 11 insertions, 9 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index a75caab0..21c7a1bc 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -69,22 +69,24 @@ for opts in ${KCL}; do
done
# suppress kernel output if DEBUG is not set
-[ "$DEBUG" -ge 1 ] && echo "0" >/proc/sys/kernel/printk || echo "4 4 1 7" >/proc/sys/kernel/printk
+[ $DEBUG -ge 1 ] && echo "0" >/proc/sys/kernel/printk || echo "4 4 1 7" >/proc/sys/kernel/printk
-# start plymouth if activated
-if [ "x$SPLASH" == "x1" -a "$DEBUG" -lt 1 ]; then
- echo "Starting plymouth..."
- plymouthd && plymouth show-splash
-fi
-
-[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network."
+[ $DEBUG -ge 5 ] && drop_shell "Requested Debug Shell: before network."
. "/bin/setup_network" || drop_shell "Error setting up network"
-[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
+[ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: after network/before configuring."
. "/bin/activate_sysconfig" || drop_shell "Could not source /bin/activate_sysconfig"
+[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
+
+# start plymouth if activated
+if [ "x$SPLASH" == "x1" -a "$DEBUG" -lt 1 ]; then
+ echo "Starting plymouth..."
+ plymouthd && plymouth show-splash
+fi
+
[ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after configuration/before stage32."
. "/bin/setup_stage32" || drop_shell "Problem setting up stage3.2"