Changeset 423

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.

Location:

main/linuxmuster-linbo/trunk

Files:

• conf/initramfs.conf (modified) (1 diff)
• conf/kernel.conf (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• linbo/etc/ata_modules (added)
• linbo/etc/ide_modules (added)
• linbo/init.sh (modified) (4 diffs)

main/linuxmuster-linbo/trunk/conf/initramfs.conf

@@ -17 +17 @@
 file /etc/services ../../linbo/etc/services 644 0 0
 file /etc/nsswitch.conf ../../linbo/etc/nsswitch.conf 644 0 0
+
+# modules lists
+file /etc/ata_modules ../../linbo/etc/ata_modules 644 0 0
+file /etc/ide_modules ../../linbo/etc/ide_modules 644 0 0
 
 # shared libraries

main/linuxmuster-linbo/trunk/conf/kernel.conf

@@ -2 +2 @@
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28.2
-# Mon Jan 26 16:47:15 2009
+# Thu Jan 29 20:52:48 2009
 #
 # CONFIG_64BIT is not set
@@ -702 +702 @@
 CONFIG_SCSI_SAS_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=y
+# CONFIG_SCSI_SAS_ATA is not set
 CONFIG_SCSI_SAS_HOST_SMP=y
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
@@ -770 +771 @@
 CONFIG_SCSI_DH_EMC=m
 CONFIG_SCSI_DH_ALUA=m
-CONFIG_ATA=m
+CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_ACPI=y
 CONFIG_SATA_PMP=y
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_SIL24=m
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
 CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=m
+CONFIG_SATA_SVW=y
 CONFIG_ATA_PIIX=m
 # CONFIG_SATA_MV is not set
-CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
+CONFIG_SATA_NV=y
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SX4=y
+CONFIG_SATA_SIL=y
 CONFIG_SATA_SIS=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+CONFIG_SATA_INIC162X=y
 CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m

main/linuxmuster-linbo/trunk/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.1.8-1) unstable; urgency=low
+
+  * compiled sata drivers static, pata and ide drivers as modules
+  * deactivated deprecated old ide/sata option again
+  * new upstream version of grub4dos -> 0.4.4-2009-01-28
+  * init.sh: reworked module loading in hwsetup() using ata and ide module lists
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Thu, 29 Jan 2009 20:49:56 +0100
+
 linuxmuster-linbo (1.1.7-1) unstable; urgency=low
 

main/linuxmuster-linbo/trunk/debian/md5sums.src

@@ -2 +2 @@
 09addfe7ae469677da39ed66d83858d3  chntpw-source-080526.zip
 b44b62af69863fc74f2946a56466d19d  cloop_2.628-2.tar.gz
-64a232e9d1ec270a1dc008a8b01675bf  grub4dos-0.4.4-2009-01-26-src.zip
+83cc7c162ade60cc24efe3bdd3dc334c  grub4dos-0.4.4-2009-01-28-src.zip
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 8fce853ebfe658f0833d34bb1dc14d86  linux-2.6.28.2.tar.bz2

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
+