Changeset 423 for main/linuxmuster-linbo/trunk/linbo/init.sh

Timestamp:

01/29/09 22:14:18 (3 years ago)

Author:

tschmitt

Message:

• SATA-Treiber sind jetzt statisch, IDE- und PATA-Treiber modular im LINBO-Kernel.
• alte IDE-SATA-Treiber wieder deaktiviert.
• Hardwareerkennung in init.sh überarbeitet: Module werden gemäß den Modullisten /etc/ata_modules bzw. - wenn "useide" gesetzt - /etc/ide_modules geladen.
• Grub4dos auf Version 0.4.4-2009-01-28 aktualisiert.

File:

• main/linuxmuster-linbo/trunk/linbo/init.sh (modified) (4 diffs)

main/linuxmuster-linbo/trunk/linbo/init.sh

@@ -58 +58 @@
  echo 0 >/proc/sys/kernel/printk
  CMDLINE="$(cat /proc/cmdline)"
+ echo "$CMDLINE" | grep -q debug && debug=yes
+ echo "$CMDLINE" | grep -q useide && useide=yes
  mount -t sysfs /sys /sys
  mount -t devpts /dev/pts /dev/pts 2>/dev/null
@@ -181 +183 @@
  UNAME="$(uname -r)"
  NETMODULES="$(findmodules /lib/modules/$UNAME/kernel/drivers/net)"
- for m in $NETMODULES; do modprobe "$m" & done
+ for m in $NETMODULES; do
+  if [ -n "$debug" ]; then
+   modprobe -v "$m"
+  else
+   modprobe -q "$m"
+  fi
+ done
  sleep 2
  if [ -n "$ipaddr" ]; then
@@ -223 +231 @@
 hwsetup(){
  rm -f /tmp/linbo-cache.done
- UNAME="$(uname -r)"
- HDDMODULES="$(findmodules /lib/modules/$UNAME/kernel/drivers/usb /lib/modules/$UNAME/kernel/drivers/scsi)"
- if cat /proc/cmdline | grep -q useide; then
-  HDDMODULES="$(findmodules /lib/modules/$UNAME/kernel/drivers/ide) $HDDMODULES"
+ if [ -n "$useide" ]; then
+  HDDMODULES="$(cat /etc/ide_modules)"
+  drive=/dev/hda
  else
-  HDDMODULES="$(findmodules /lib/modules/$UNAME/kernel/drivers/ata) $HDDMODULES"
- fi
- FSMODULES="$(findmodules /lib/modules/$UNAME/kernel/fs)"
- # Silence
- for m in $HDDMODULES $FSMODULES; do modprobe "$m" & done
- sleep 1
- enable_dma
+  HDDMODULES="$(cat /etc/ata_modules)"
+  drive=/dev/sda
+ fi
+ # load modules only if drive is not yet present
+ if ! sfdisk -l $drive; then 
+  for m in $HDDMODULES; do
+   modprobe -v "$m"
+   if sfdisk -l $drive >/dev/null 2>&1; then
+    echo "Success!"
+    break
+   else
+    modprobe -r "$m"
+   fi
+  done
+  sleep 2
+ fi
+ [ -n "$useide" ] && enable_dma
  echo > /tmp/linbo-cache.done 
 }
@@ -242 +259 @@
 
 # Initial setup
-init_setup >/dev/null 2>&1
+if [ -n "$debug" ]; then
+ init_setup
+else
+ init_setup >/dev/null 2>&1
+fi
 
 # BG processes (HD and Network detection can run in parallel)
-hwsetup >/dev/null 2>&1 &
-network >/dev/null 2>&1 &
-
+if [ -n "$debug" ]; then
+ hwsetup &
+ network &
+else
+ hwsetup >/dev/null 2>&1 &
+ network >/dev/null 2>&1 &
+fi
+