summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2013-08-22 18:04:34 +0200
committerJonathan Bauer2013-08-22 18:04:34 +0200
commitae706e5ade317dce97a0719d6f70bf8434d06104 (patch)
tree6e69187f5cfa719c7359d1a0192e573d48db9272 /remote
parent[plymouth-freiburg] update description (diff)
downloadtm-scripts-ae706e5ade317dce97a0719d6f70bf8434d06104.tar.gz
tm-scripts-ae706e5ade317dce97a0719d6f70bf8434d06104.tar.xz
tm-scripts-ae706e5ade317dce97a0719d6f70bf8434d06104.zip
[rootfs-stage31] use '--kernel-command-line' option of plymouthd to give it the required 'splash' parameter. Makes 'splash' in the kcl of pxe-menus obsolete
Diffstat (limited to 'remote')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init6
1 files changed, 4 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 21c7a1bc..cc552137 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -84,7 +84,9 @@ done
# start plymouth if activated
if [ "x$SPLASH" == "x1" -a "$DEBUG" -lt 1 ]; then
echo "Starting plymouth..."
- plymouthd && plymouth show-splash
+ # link the theming directory from the config to the current root
+ ln -sf /mnt/usr/share /usr/share
+ plymouthd --kernel-command-line="splash" && plymouth show-splash
fi
[ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after configuration/before stage32."
@@ -100,7 +102,7 @@ tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C
[ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
# tell plymouth about the immediate rootfs switch
-[ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
+[ "x$SPLASH" == "x1" -a $DEBUG -lt 1 ] && plymouth update-root-fs --new-root-dir=/mnt
# unmount filesystems
for mnt in proc sys run ; do