[Fai-commit] r4925 - in trunk: examples/simple/class lib

[lange at alioth.debian.org]

Author: lange
Date: 2008-06-02 12:38:26 +0000 (Mon, 02 Jun 2008)
New Revision: 4925

Modified:
   trunk/examples/simple/class/20-hwdetect.source
   trunk/lib/subroutines-linux
Log:
add variable printk


Modified: trunk/examples/simple/class/20-hwdetect.source
===================================================================
--- trunk/examples/simple/class/20-hwdetect.source	2008-06-02 12:38:01 UTC (rev 4924)
+++ trunk/examples/simple/class/20-hwdetect.source	2008-06-02 12:38:26 UTC (rev 4925)
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# (c) Thomas Lange, 2002-2007, lange at informatik.uni-koeln.de
+# (c) Thomas Lange, 2002-2008, lange at informatik.uni-koeln.de
 
 # NOTE: Files named *.source will be evaluated, but their output ignored. Instead
 # the contents of $newclasses will be added to the list of defined classes.
@@ -23,7 +23,7 @@
 
 # load additional kernel modules (from old 11modules.source)
 # this order should also enable DMA for all IDE drives
-kernelmodules="rtc floppy usbkbd ide-disk ide-cd"
+kernelmodules="rtc usbkbd ide-disk ide-cd"
 case $(uname -r) in
     2.4*) kernelmodules="$kernelmodules keybdev mousedev hid ide-detect isa-pnp" ;;
     2.6*) kernelmodules="$kernelmodules ehci-hcd ohci-hcd uhci-hcd usbhid usbmouse ide-generic mptspi ata_piix" ;;
@@ -43,7 +43,7 @@
 
 modprobe -a sd_mod sr_mod
 
-echo 6 > /proc/sys/kernel/printk
+echo $printk > /proc/sys/kernel/printk
 
 set_disk_info  # calculate number of available disks
 save_dmesg     # save new boot messages (from loading modules)

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2008-06-02 12:38:01 UTC (rev 4924)
+++ trunk/lib/subroutines-linux	2008-06-02 12:38:26 UTC (rev 4925)
@@ -5,7 +5,7 @@
 # subroutine definitions for linux
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2005-2007 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2005-2008 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO
@@ -65,8 +65,9 @@
         . $bootlog
         unset T170 T171 T172 ROOT_PATH BOOTFILE
 
-        echo 6 > /proc/sys/kernel/printk
-	klogd -c7 -f $LOGDIR/kernel.log
+	printk=6
+	echo $printk > /proc/sys/kernel/printk
+	klogd -f $LOGDIR/kernel.log
 	echo "*.* $LOGDIR/syslog.log" > /etc/syslog.conf
 	syslogd -m 0
         create_resolv_conf