[Devil-linux-commit] build/config/etc/init.d boot,1.22,1.23

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8795/config/etc/init.d

Modified Files:
	boot 
Log Message:
- clamav prints success if database was updated or is up-to-date (Heiko /
Roland Pabel)
- cosmetic fixes of boot message (Heiko / Roland Pabel)


Index: boot
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- boot	26 May 2004 13:15:12 -0000	1.22
+++ boot	2 Jul 2004 01:40:41 -0000	1.23
@@ -10,7 +10,6 @@
 # Initial Startup Script for Devil-Linux
 #
 
-
 ### BEGIN INIT INFO
 # Provides:       boot
 # Required-Start:
@@ -29,8 +28,23 @@
 source /etc/init.d/functions
 source /etc/sysconfig/config
 
-echo -n "Mounting base Filesystems"
-mount -n -t proc proc /proc
+echo -n "Mounting base Filesystems : "
+$GREEN
+mount -n -t proc proc /proc && echo -e -n " proc "
+#mount -t devpts devpts /dev/pts && echo -e -n " devpts "
+# Kernel dependent mounts
+case `uname -r` in
+    2.4.*) # Kernel 2.4.*
+	mount -n -t usbdevfs none /proc/bus/usb && echo -e -n " usbdevfs "
+	;;
+    2.6.*) # Kernel 2.6.*
+	mount -n -t sysfs sys /sys && echo -e -n " sysfs "    
+	;;
+esac
+$NORMAL
+rm -f /etc/mtab
+cat /proc/mounts > /etc/mtab
+print_status success
 
 if [ -f /proc/sys/kernel/sysrq ]; then
 	echo -n "Enabling magic SysRq"
@@ -38,18 +52,6 @@
 	print_status success
 fi
 
-#
-# mount sys for 2.6
-#
-if [ -d /sys ]; then
-	mount -n -t sysfs sys /sys
-fi
-#
-rm -f /etc/mtab
-cat /proc/mounts > /etc/mtab
-#mount -t devpts devtps /dev/pts
-print_status success
-
 echo -n "Sync'ing filesystems"
 sync
 evaluate_retval
@@ -62,7 +64,8 @@
 	modprobe apm power_off=1
 fi
 
-echo "Setting Kernel log levels"
+echo -n "Setting Kernel log levels"
 echo "1       4       1       7" > /proc/sys/kernel/printk 
+evaluate_retval
 
 exit 0