summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2013-11-06 13:41:13 +0100
committerJonathan Bauer2013-11-06 13:41:13 +0100
commitebf04a4aa3865d7288e128764c90c0e547ef9b21 (patch)
tree1a91c82f144549cb8048eee8da8c16f6ae9bc39e /remote
parent[vmchooser] remove forced version 3 for nfs mounting of vmstore (diff)
downloadtm-scripts-ebf04a4aa3865d7288e128764c90c0e547ef9b21.tar.gz
tm-scripts-ebf04a4aa3865d7288e128764c90c0e547ef9b21.tar.xz
tm-scripts-ebf04a4aa3865d7288e128764c90c0e547ef9b21.zip
[rootfs-stage31] fix plymouthd not finding its theme since we were not
using the right prefix: changed "/mnt" to "$FUTURE_ROOT"
Diffstat (limited to 'remote')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init8
1 files changed, 3 insertions, 5 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 6ba3d01a..1dd0c108 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -53,8 +53,6 @@ for opts in ${KCL}; do
case "${opts}" in
debug=*)
DEBUG=${opts#debug=} ;;
- splash*)
- SPLASH=1 ;;
ip=*)
# process IP info
export IPINFO=${opts#ip=} ;;
@@ -69,7 +67,7 @@ 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
[ $DEBUG -ge 5 ] && drop_shell "Requested Debug Shell: before network."
@@ -82,10 +80,10 @@ done
[ $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
+if [ $DEBUG -lt 1 ]; then
echo "Starting plymouth..."
# link the theming directory from the config to the current root
- ln -sf /mnt/usr/share /usr/share
+ ln -sf "${FUTURE_ROOT}/usr/share" /usr/share
plymouthd --kernel-command-line="splash" && plymouth show-splash
fi