SliTaz Repositories

     1.1 --- a/etc/init.d/rcS	Sun Apr 26 16:31:46 2009 +0200
     1.2 +++ b/etc/init.d/rcS	Mon Apr 27 23:20:13 2009 +0200
     1.3 @@ -8,8 +8,18 @@
     1.4  . /etc/init.d/rc.functions
     1.5  . /etc/rcS.conf
     1.6  
     1.7 +if [ "$1" != "logged" ]; then # logged
     1.8 +
     1.9 +echo "Processing /etc/init.d/rcS..."
    1.10 +
    1.11 +# Mount /proc.
    1.12 +echo -n "Mounting proc filesystem..."
    1.13 +/bin/mount proc
    1.14 +status
    1.15 +
    1.16  # Parse cmdline args for earlier boot options. All other boot options
    1.17  # are in /etc/init./bootopts.sh.
    1.18 +echo -n "Searching for early boot options..."
    1.19  for opt in `cat /proc/cmdline`
    1.20  do
    1.21  	case $opt in
    1.22 @@ -25,14 +35,6 @@
    1.23  			continue ;;
    1.24  	esac
    1.25  done
    1.26 -
    1.27 -if [ "$1" != "logged" ]; then # logged
    1.28 -
    1.29 -echo "Processing /etc/init.d/rcS... "
    1.30 -
    1.31 -# Mount /proc.
    1.32 -echo -n "Mounting proc filesystem... "
    1.33 -/bin/mount proc
    1.34  status
    1.35  
    1.36  # Start Udev to populate /dev and handle hotplug events
    1.37 @@ -61,11 +63,11 @@
    1.38  fi
    1.39  
    1.40  # Remount rootfs rw.
    1.41 -echo "Remounting rootfs read/write... "
    1.42 +echo "Remounting rootfs read/write..."
    1.43  /bin/mount -o remount,rw /
    1.44  
    1.45  # Mount filesystems in /etc/fstab.
    1.46 -echo "Mounting filesystems in fstab... "
    1.47 +echo "Mounting filesystems in fstab..."
    1.48  /bin/mount -a
    1.49  
    1.50  # Store boot messages to log files.
    1.51 @@ -77,19 +79,19 @@
    1.52  
    1.53  # Clean up the system.
    1.54  if [ "$CLEAN_UP_SYSTEM" = "yes" ]; then
    1.55 -	echo -n "Cleaning up the system... "
    1.56 +	echo -n "Cleaning up the system..."
    1.57  	/bin/rm -rf /tmp /var/run/*.pid /var/run/dbus/* \
    1.58  		/var/run/hald/pid /var/lock/*
    1.59  	/bin/mkdir -p /tmp && /bin/chmod 1777 /tmp
    1.60  	status
    1.61  else
    1.62 -	echo "System clean up is disabled in /etc/rcS.conf... "
    1.63 -	echo -n "Keeping all tmp and pid files... "
    1.64 +	echo "System clean up is disabled in /etc/rcS.conf..."
    1.65 +	echo -n "Keeping all tmp and pid files..."
    1.66  	status
    1.67  fi
    1.68  
    1.69  # Set up tmp X11 and ICE dir.
    1.70 -echo -n "Setting up tmp X11 and ICE unix dir... "
    1.71 +echo -n "Setting up tmp X11 and ICE unix dir..."
    1.72  /bin/mkdir -p /tmp/.X11-unix /tmp/.ICE-unix
    1.73  /bin/chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix
    1.74  status
    1.75 @@ -161,7 +163,7 @@
    1.76  			CONFIG=""
    1.77  		fi
    1.78  	fi
    1.79 -	echo -n "Source $SCRIPT from $DEVICE... "
    1.80 +	echo -n "Source $SCRIPT from $DEVICE..."
    1.81  	if [ -n "$CONFIG" ]; then
    1.82  		. /mnt/$SCRIPT
    1.83  		/bin/umount /mnt
    1.84 @@ -171,19 +173,19 @@
    1.85  
    1.86  # Mount /proc/bus/usb.
    1.87  if [ -d /proc/bus/usb ]; then
    1.88 -	echo -n "Mounting /proc/bus/usb filesystem... "
    1.89 +	echo -n "Mounting /proc/bus/usb filesystem..."
    1.90  	/bin/mount -t usbfs usbfs /proc/bus/usb
    1.91  	status
    1.92  fi
    1.93  
    1.94  # Start syslogd and klogd.
    1.95  if [ "$KERNEL_LOG_DAEMONS" = "yes" ]; then
    1.96 -	echo -n "Starting system log deamon: syslogd... "
    1.97 +	echo -n "Starting system log deamon: syslogd..."
    1.98  	/sbin/syslogd -s $SYSLOGD_ROTATED_SIZE && status
    1.99 -	echo -n "Starting kernel log daemon: klogd... "
   1.100 +	echo -n "Starting kernel log daemon: klogd..."
   1.101  	/sbin/klogd && status
   1.102  else
   1.103 -	echo "Kernel log daemons are disabled in /etc/rc.conf... "
   1.104 +	echo "Kernel log daemons are disabled in /etc/rc.conf..."
   1.105  fi
   1.106  
   1.107  # Load all modules listed in config file.