slitaz-boot-scripts rev 261
Fixed rcS. Now mouse and keyboard will work. I commented out tazbox boot for since we would only get openbox and nothing else.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Apr 30 21:10:06 2011 +0000 (2011-04-30) |
parents | 2690856778e6 |
children | a0f7424e5486 |
files | etc/init.d/rcS |
line diff
1.1 --- a/etc/init.d/rcS Sat Apr 30 03:37:09 2011 +0000 1.2 +++ b/etc/init.d/rcS Sat Apr 30 21:10:06 2011 +0000 1.3 @@ -34,7 +34,7 @@ 1.4 export TZ=$(cat /etc/TZ) 1.5 fi 1.6 1.7 -[ "$FBSPLASH" == "yes" ] && echo "20" > /etc/fbsplash/fifo 1.8 +[ "$FBSPLASH" == "yes" ] && echo "10" > /etc/fbsplash/fifo 1.9 1.10 # Parse cmdline args for earlier boot options. All other boot options 1.11 # are in /etc/init./bootopts.sh. 1.12 @@ -54,7 +54,9 @@ 1.13 export SCREEN=${opt#screen=} ;; 1.14 autologin) 1.15 # Autologin option to skip first graphic login prompt. 1.16 - echo "auto_login yes" >> /etc/slim.conf ;; 1.17 + if [ ! $(grep -l '^auto_login yes' /etc/slim.conf) ]; then 1.18 + echo "auto_login yes" >> /etc/slim.conf 1.19 + fi ;; 1.20 lang=*) 1.21 # Check for a specified locale (lang=*). 1.22 LANG=${opt#lang=} 1.23 @@ -72,7 +74,7 @@ 1.24 esac 1.25 done 1.26 1.27 -[ "$FBSPLASH" == "yes" ] && echo "40" > /etc/fbsplash/fifo 1.28 +[ "$FBSPLASH" == "yes" ] && echo "20" > /etc/fbsplash/fifo 1.29 1.30 # Before mounting filesystems we check fs specified in the file 1.31 # /etc/rcS.conf and variable $CHECK_FS. 1.32 @@ -105,7 +107,7 @@ 1.33 status 1.34 fi 1.35 1.36 -[ "$FBSPLASH" == "yes" ] && echo "60" > /etc/fbsplash/fifo 1.37 +[ "$FBSPLASH" == "yes" ] && echo "30" > /etc/fbsplash/fifo 1.38 1.39 # Mount filesystems in /etc/fstab. 1.40 echo "Mounting filesystems in fstab..." 1.41 @@ -131,7 +133,7 @@ 1.42 status 1.43 fi 1.44 1.45 -[ "$FBSPLASH" == "yes" ] && echo "70" > /etc/fbsplash/fifo 1.46 +[ "$FBSPLASH" == "yes" ] && echo "40" > /etc/fbsplash/fifo 1.47 1.48 # Set up tmp X11 and ICE dir. 1.49 echo -n "Setting up tmp X11 and ICE unix dir..." 1.50 @@ -139,45 +141,6 @@ 1.51 /bin/chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix 1.52 status 1.53 1.54 -# Start DBUS and HAL deamon so we can use Xorg and a WM to configure 1.55 -# system locale and keybord on first boot. 1.56 -[ -x /etc/init.d/dbus ] && /etc/init.d/dbus start 1.57 -[ -x /etc/init.d/hald ] && /etc/init.d/hald start 1.58 - 1.59 -# Requested screen is not text mode and keymap.conf is empty so go 1.60 -# for an i18n configuration in GUI mode. In cas of screen=text we 1.61 -# configure locale and keymap just after via i18n.sh 1.62 -if [ "$SCREEN" != "text" -a ! -s "/etc/keymap.conf" -a -x /usr/bin/Xorg ]; then 1.63 - DISPLAY=:1 tazbox boot 1.64 -fi 1.65 - 1.66 -[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo 1.67 - 1.68 -# Set the console keymap and configure i18n in case of screen=text and 1.69 -# no locale.conf or keymap.conf. Add default user for live mode and 1.70 -# mount an eventual /home partition. 1.71 -/etc/init.d/i18n.sh 1.72 -/etc/init.d/user-home.sh 1.73 - 1.74 -[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo 1.75 - 1.76 -# Now that we have a keymap configuration we can auto configure Xorg. 1.77 -# We need to set $HOME. 1.78 -if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then 1.79 - echo "Configuring Xorg..." 1.80 - HOME=/root 1.81 - tazx config-xorg 1.82 -fi 1.83 - 1.84 -# Here we finish bootsplash since we start Xorg session. 1.85 -[ "$FBSPLASH" == "yes" ] && sleep 1 && echo "exit" > /etc/fbsplash/fifo 1.86 - 1.87 -# No text mode requested, we have i18n and Xorg settings as well as a 1.88 -# user, so start a desktop and let boot process finih in backgroud. 1.89 -if [ "$SCREEN" != "text" -a -x /etc/init.d/slim ]; then 1.90 - /etc/init.d/slim start 1.91 -fi 1.92 - 1.93 # Create /dev/cdrom if needed (symlink does not exist on LiveCD). 1.94 # Also add /dev/cdrom to fstab if entry does not exist. 1.95 if [ -n "$CDROM" ]; then 1.96 @@ -198,6 +161,8 @@ 1.97 status 1.98 fi 1.99 1.100 +[ "$FBSPLASH" == "yes" ] && echo "50" > /etc/fbsplash/fifo 1.101 + 1.102 # Chmod hack on each boot for Asunder and burnbox. Allowing all users 1.103 # to burn/rip CD/DVD. 1.104 if [ -n "$DRIVE_NAME" -a "`readlink /dev/cdrom`" ]; then 1.105 @@ -218,6 +183,8 @@ 1.106 done 1.107 fi 1.108 1.109 +[ "$FBSPLASH" == "yes" ] && echo "60" > /etc/fbsplash/fifo 1.110 + 1.111 # Handle kernel cmdline parameter config=<device>,<path> to source a 1.112 # disk init script 1.113 if [ -n "$CONFIG" ]; then 1.114 @@ -260,6 +227,8 @@ 1.115 echo "Kernel log daemons are disabled in /etc/rc.conf..." 1.116 fi 1.117 1.118 +[ "$FBSPLASH" == "yes" ] && echo "70" > /etc/fbsplash/fifo 1.119 + 1.120 # Load all modules listed in config file. 1.121 if [ -n "$LOAD_MODULES" ]; then 1.122 for mod in $LOAD_MODULES 1.123 @@ -283,6 +252,45 @@ 1.124 status 1.125 fi 1.126 1.127 +# Start DBUS and HAL deamon so we can use Xorg and a WM to configure 1.128 +# system locale and keybord on first boot. 1.129 +[ -x /etc/init.d/dbus ] && /etc/init.d/dbus start 1.130 +[ -x /etc/init.d/hald ] && /etc/init.d/hald start 1.131 + 1.132 +[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo 1.133 + 1.134 +# Set the console keymap and configure i18n in case of screen=text and 1.135 +# no locale.conf or keymap.conf. Add default user for live mode and 1.136 +# mount an eventual /home partition. 1.137 +/etc/init.d/i18n.sh 1.138 +/etc/init.d/user-home.sh 1.139 + 1.140 +# Requested screen is not text mode and keymap.conf is empty so go 1.141 +# for an i18n configuration in GUI mode. In cas of screen=text we 1.142 +# configure locale and keymap just after via i18n.sh 1.143 +#if [ "$SCREEN" != "text" -a ! -s "/etc/keymap.conf" -a -x /usr/bin/Xorg ]; then 1.144 +# DISPLAY=:1 tazbox boot 1.145 +#fi 1.146 + 1.147 +[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo 1.148 + 1.149 +# Now that we have a keymap configuration we can auto configure Xorg. 1.150 +# We need to set $HOME. 1.151 +if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then 1.152 + echo "Configuring Xorg..." 1.153 + HOME=/root 1.154 + tazx config-xorg 1.155 +fi 1.156 + 1.157 +# Here we finish bootsplash since we start Xorg session. 1.158 +[ "$FBSPLASH" == "yes" ] && sleep 1 && echo "exit" > /etc/fbsplash/fifo 1.159 + 1.160 +# No text mode requested, we have i18n and Xorg settings as well as a 1.161 +# user, so start a desktop and let boot process finih in backgroud. 1.162 +if [ "$SCREEN" != "text" -a -x /etc/init.d/slim ]; then 1.163 + /etc/init.d/slim start 1.164 +fi 1.165 + 1.166 # Auto recharge packages list (after network connection of course) 1.167 [ "$RECHARGE_PACKAGES_LIST" == "yes" ] && tazpkg recharge & 1.168