diff options
author | Simon Rettberg | 2014-02-26 11:37:36 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-02-26 11:37:36 +0100 |
commit | 0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55 (patch) | |
tree | ce74b10a3443fa157d5356d9a92612e3c0d2386a | |
parent | Restart splash screen in stage32 (if booting with splashscreen enabled) (diff) | |
download | tm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.tar.gz tm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.tar.xz tm-scripts-0dc4905aa03ff17d0f19dc80c7ebcee38e7d8c55.zip |
Tweaked fbsplash to survive switch_root, kill it before spawning getty or kdm
6 files changed, 5 insertions, 32 deletions
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service index e07ae6fc..da5e2729 100644 --- a/remote/modules/kdm/data/etc/systemd/system/kdm.service +++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service @@ -4,6 +4,7 @@ Conflicts=getty@tty7.service After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service [Service] +ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash ExecStart=/usr/bin/kdm -nodaemon Restart=always IgnoreSIGPIPE=no diff --git a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service index 7e218d11..3586e04a 100644 --- a/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service +++ b/remote/modules/systemd/data/usr/lib/systemd/system/getty@.service @@ -1,4 +1,5 @@ # This file is part of systemd. +# Patched for OpenSLX # # systemd is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by @@ -9,7 +10,7 @@ Description=Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html -After=systemd-user-sessions.service plymouth-quit-wait.service +After=systemd-user-sessions.service After=rc-local.service # If additional gettys are spawned during boot then we should make @@ -24,6 +25,7 @@ IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 [Service] +ExecStartPre=-/opt/openslx/usr/bin/killall fbsplash # the VT is cleared by TTYVTDisallocate ExecStart=-/sbin/agetty --noclear %I 38400 linux Type=idle @@ -45,5 +47,3 @@ Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETA # instead, to ensure that login terminates cleanly. KillSignal=SIGHUP -[Install] -Alias=getty.target.wants/getty@tty1.service diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index a4de8131..b3681eee 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -63,6 +63,7 @@ if [ "$SPLASH" -eq 1 ]; then echo "1 1 0 1" > /proc/sys/kernel/printk exec 4>&1 5>&2 > /dev/null 2>&1 MUTED_OUTPUT=1 + echo -e "\033[?25l" setsid fbsplash -x -c -s /etc/splash.ppm & fi else @@ -115,12 +116,6 @@ for mnt in proc sys run ; do busybox umount -f -l "/$mnt" 2>/dev/null done -# make sure the splash screen is restarted in stage32 -if [ "$SPLASH" -eq 1 ]; then - ln -s "../fbsplash.service" "${FUTURE_ROOT}/etc/systemd/system/sysinit.target.wants/fbsplash.service" - killall fbsplash -fi - echo "Switching root...." echo "$bench_result" > "${FUTURE_ROOT}/opt/openslx/.benchmark" # Prepare environment (HOME is needed as a hack for nss_ldap with ssl and no caching) diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service deleted file mode 100644 index 39d56ec0..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/fbsplash.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Revive fbsplash splash-screen -DefaultDependencies=no -After=systemd-tmpfiles-setup-dev.service -Before=sysinit.target - -[Service] -ExecStart=/opt/openslx/sbin/fbsplash -x -c -s /etc/splash.ppm -ExecStop=/opt/openslx/usr/bin/killall fbsplash - diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/getty.target.wants/killsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/getty.target.wants/killsplash.service deleted file mode 120000 index 40a962d5..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/getty.target.wants/killsplash.service +++ /dev/null @@ -1 +0,0 @@ -../killsplash.service
\ No newline at end of file diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service deleted file mode 100644 index 1759b798..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Stop splash screen -Before=getty.target graphical.target -DefaultDependencies=no - -[Service] -Type=oneshot -ExecStart=-/usr/bin/systemctl stop fbsplash.service -ExecStart=-/opt/openslx/usr/bin/killall fbsplash -ExecStart=/opt/openslx/bin/true -RemainAfterExit=no - |