Changeset 446

Timestamp:

02/10/09 20:29:56 (3 years ago)

Author:

tschmitt

Message:

• pci.ids, hwinfo und lspci zu linbofs hinzugefügt
• init.sh nutzt nun hwinfo zur Erkennung des Festplattenkontrollers
• Grub4dos update auf Version 0.4.4-2009-02-09
• dac960-Treiber jetzt als Modul, zur ata_modules-Liste hinzugefügt

Location:

main/linuxmuster-linbo/trunk

Files:

• conf/initramfs.conf (modified) (1 diff)
• conf/kernel.conf (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• debian/rules (modified) (3 diffs)
• linbo/etc/ata_modules (modified) (2 diffs)
• linbo/init.sh (modified) (1 diff)

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

@@ -144 +144 @@
 file /bin/ssmtp ../../src/ssmtp/ssmtp 755 0 0
 
+# hwinfo
+dir /usr/share/misc 755 0 0
+file /bin/lspci /usr/bin/lspci 755 0 0
+file /sbin/hwinfo /usr/sbin/hwinfo 755 0 0
+file /usr/lib/libhd.so.13 /usr/lib/libhd.so.13 755 0 0
+file /usr/lib/libdbus-1.so.3 /usr/lib/libdbus-1.so.3 755 0 0
+file /usr/lib/libhal.so.1 /usr/lib/libhal.so.1 755 0 0
+file /usr/share/misc/pci.ids ../../src/pci.ids 644 0 0
+

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

@@ -2 +2 @@
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28.4
-# Sat Feb  7 11:17:47 2009
+# Tue Feb 10 19:15:10 2009
 #
 # CONFIG_64BIT is not set
@@ -570 +570 @@
 CONFIG_BLK_CPQ_CISS_DA=y
 CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=y
+CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set

main/linuxmuster-linbo/trunk/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.1.11-1) unstable; urgency=low
+
+  * added pci.ids, hwinfo and lspci to linbofs
+  * init.sh now uses hwinfo for storage controller recognition
+  * new upstream version of grub4dos -> 0.4.4-2009-02-09
+  * dac960 compiled as module and added to ata_modules list
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 10 Feb 2009 20:11:21 +0100
+
 linuxmuster-linbo (1.1.10-1) unstable; urgency=low
 

main/linuxmuster-linbo/trunk/debian/control

@@ -5 +5 @@
 Build-Depends: debhelper (>= 4), build-essential, fakeroot, qt3-dev-tools, flex, wget, gcc-4.1, g++-4.1, ncurses-base,
                coreutils, sysvinit-utils, util-linux, libstdc++6, reiserfsprogs, e2fsprogs, dosfstools, unzip, tar, gzip,
-               gettext, zlib1g-dev, libncurses5-dev, tetex-base, tetex-bin, tetex-extra, udpcast
+               gettext, zlib1g-dev, libncurses5-dev, tetex-base, tetex-bin, tetex-extra, udpcast, hwinfo
 Standards-Version: 3.6.1
 

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

@@ -2 +2 @@
 09addfe7ae469677da39ed66d83858d3  chntpw-source-080526.zip
 b44b62af69863fc74f2946a56466d19d  cloop_2.628-2.tar.gz
-541fc7d73876c3db0eef2d9e9f8f651b  grub4dos-0.4.4-2009-02-05-src.zip
+dbd1afa4f96862af39497da78701a2e7  grub4dos-0.4.4-2009-02-09-src.zip
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
 8228bb7804d6d0099eadfabf701c295b  linux-2.6.28.4.tar.bz2

main/linuxmuster-linbo/trunk/debian/rules

@@ -74 +74 @@
 SSMTP_DIR=src/ssmtp
 SSMTP_URL=http://archive.ubuntu.com/ubuntu/pool/universe/s/ssmtp
+
+#pci.ids
+PCIIDS=http://pciids.sourceforge.net/v2.2/pci.ids.gz
 
 configure: configure-stamp
@@ -193 +196 @@
                 ln -sf ../$(CLOOP_DIR) kernel/cloop; \
         fi
+
+        # pci.ids
+        wget $(PCIIDS) -O cache/pci.ids.gz
+        ( [ -e cache/pci.ids.gz ] && gzip -c cache/pci.ids.gz > src/pci.ids )
+        rm cache/pci.ids.gz
 
         # kernel
@@ -345 +353 @@
         echo >> ../initramfs.conf ; \
         echo "# modules" >> ../initramfs.conf ; \
-        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
+        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -path \*/block/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
         echo >> ../initramfs.conf ; \
         echo "# busybox applets" >> ../initramfs.conf ; \

main/linuxmuster-linbo/trunk/linbo/etc/ata_modules

@@ -15 +15 @@
 pdc_adma
 sx8
+dac960
 pata_atiixp
 pata_amd
@@ -58 +59 @@
 pata_triflex
 pata_winbond
-

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

@@ -231 +231 @@
 hwsetup(){
  rm -f /tmp/linbo-cache.done
- if [ -n "$useide" ]; then
-  HDDMODULES="$(cat /etc/ide_modules)"
-  drive=/dev/hda
+ echo "Searching for storage controller ..." | tee /tmp/linbo.log
+ hwinfo --storage-ctrl | tee -a /tmp/linbo.log
+ modules=`grep modprobe /tmp/linbo.log | awk -F\" '{ print $2 }' | awk '{ print $2 }'`
+ if [ -n "$modules" ]; then
+  if [ -n "$useide" ]; then
+   echo "Probing IDE modules (useide) ..."  | tee -a /tmp/linbo.log
+   HDDMODULES=/etc/ide_modules
+  else
+   echo "Probing SATA/PATA modules ..."  | tee -a /tmp/linbo.log
+   HDDMODULES=/etc/ata_modules
+  fi
+  found=0
+  for m in $modules; do
+   if grep -q "$m" $HDDMODULES; then
+     echo "-> $m"  | tee -a /tmp/linbo.log
+     modprobe $m
+     found=1
+   fi
+  done
+  if [ $found = 0 ]; then
+   echo "Fatal! No modules found!" | tee -a /tmp/linbo.log
+  else
+   [ -n "$useide" ] && enable_dma
+  fi
  else
-  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
-   echo "Probing $m ..."
-   modprobe "$m" >/dev/null 2>&1
-   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 "Fatal! No storage controller found!"
+ fi
+ sleep 2
  echo > /tmp/linbo-cache.done 
 }