diff options
7 files changed, 14 insertions, 17 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/inc/drm.functions b/remote/rootfs/rootfs-stage31/data/inc/drm.functions index 666f22a9..20083724 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/drm.functions +++ b/remote/rootfs/rootfs-stage31/data/inc/drm.functions @@ -37,7 +37,7 @@ load_gfx () { setup_gfx () { local KERN RETVAL CARD CARDS SUCCESS FILES DRM # check which driver to load - CARDS=$(lspci | grep 'Class 03' | awk '{print $4}') + CARDS=$(lspci | grep 'Class 0300' | awk '{print $4}') if [ -e "/drm.cfg" ] && [ -n "$CARDS" ]; then SUCCESS="yes" for CARD in $CARDS; do diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 198f8913..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 diff --git a/remote/rootfs/rootfs-stage31/templates/drm.cfg b/remote/rootfs/rootfs-stage31/templates/drm.cfg index f0a9db0c..45eda39f 100644 --- a/remote/rootfs/rootfs-stage31/templates/drm.cfg +++ b/remote/rootfs/rootfs-stage31/templates/drm.cfg @@ -1,6 +1,12 @@ -# nvidia +## nvidia +# 8800 GTS 10de:0193 @nvidia +# ION +10de:087d @nvidia +## intel +# Dell GX 620 +8086:2772 i915 # aliases @nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko @nvidia_fallback nouveau - +## 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 c3e088c8..00000000 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/killsplash.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Stop splash screen -Before=getty.target graphical.target -DefaultDependencies=no - -[Service] -Type=oneshot -ExecStart=-/opt/openslx/usr/bin/killall fbsplash -ExecStart=/opt/openslx/bin/true -RemainAfterExit=no |