diff options
| author | Dirk von Suchodoletz | 2009-03-20 12:39:26 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-03-20 12:39:26 +0100 |
| commit | 78a5c9093302e736f1cc870d4a9b5951f54f7ad7 (patch) | |
| tree | fbe39621edd322c4651167550097c78e07677fa4 /initramfs/stage3-stuff/bin/hwautocfg | |
| parent | Broader selection of windowmanagers, headers added. (diff) | |
| download | core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.tar.gz core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.tar.xz core-78a5c9093302e736f1cc870d4a9b5951f54f7ad7.zip | |
Restructured disk/tmp setup to avoid unionfs/aufs hassles of covered
mount points (r2743 didn't fix that).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2747 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/bin/hwautocfg')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index fddba8df..aee401f1 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -89,6 +89,18 @@ modprobe ${MODPRV} snd-mixer-oss [ $DEBUGLEVEL -eq 21 ] && echo "** finished most of module loading at $(sysup)" +# scanner setup (fixme: to be checked) +hwinfo --scanner >/etc/hwinfo.scanner +[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \ + >>/mnt/etc/udev/rules.d/04-scanner.rules + +# if any new device appeared up to now +mdev -s +return 0 +} +############################################################################# +# harddisk partition setup part +disk () { # get idea of availabe harddisk partitions, put swap partitions into # (/mnt)/etc/fstab and format and mount partitions of type 44 (unknown) [ $DEBUGLEVEL -eq 21 ] && echo "** starting hdd stuff at $(sysup)" @@ -129,14 +141,6 @@ else echo "no harddisk found ( $(sysup) )" >/tmp/tmpready fi [ $DEBUGLEVEL -eq 21 ] && echo "** finished hdd stuff at $(sysup)" -# scanner setup (fixme: to be checked) -hwinfo --scanner >/etc/hwinfo.scanner -[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \ - >>/mnt/etc/udev/rules.d/04-scanner.rules - -# if any new device appeared up to now -mdev -s -return 0 } ############################################################################# @@ -180,13 +184,17 @@ case $1 in base) base ;; - # main part of hardware setup including Xorg + # main part of hardware setup of pci stuff main) hwmain # main script run timer or debug information [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 21 ] && \ - echo "** HW setup finished at $(sysup)" - echo "hwsetup finished at $(sysup)" >/tmp/hwcfg + echo "** HW main setup finished at $(sysup)" + echo "hwsetup main part finished at $(sysup)" >/tmp/hwcfg + ;; + # disk setup part (detecting, formatting, mounting) + disk) + disk ;; # remove unneeded kernel modules finish) |