From 5354228bb335d5b4277d6010769cbd9cc5d3a725 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Thu, 4 Oct 2007 17:13:25 +0000
Subject: splashy works now with ubuntu.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1367 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/bin/servconfig | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'initramfs/initrd-stuff/bin')

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 0cc0fe36..6e8c0dda 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -546,11 +546,16 @@ $0: $date\n:0 local X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
         test -f /var/run/kiosk || break; sleep 3;
       done
       touch /var/run/kiosk
-      resmgr login nobody tty7 \\
+      for((i=0;\$i<=120;i=\$((\$i+1)))); do
+        [ -e /var/run/resmgr.pid ] && break
+        [ \$i = 120 ] && exit 1
+        sleep 1
+      done
+      resmgr login nobody tty8 \\
       && resmgr grant nobody desktop \\
       && chown -R nobody:nogroup /var/lib/nobody \\
-      && (su -c 'amixer -q sset Master 28 unmute
-        amixer -q sset PCM 28 unmute
+      && (su -c '(sleep 10; amixer -q sset Master 28 unmute; \\
+        amixer -q sset PCM 28 unmute) &
         xinit /var/X11R6/bin/startgui $start_x \\
         -- vt7 -quiet' -l nobody &>/dev/null)
       rm /var/run/kiosk
-- 
cgit v1.2.3-55-g7522