[tyndur-devel] [PATCH] Live-CD: Mit geladenem pci bootet es sich schneller

[Kevin Wolf <kevin@xxxxxxxxxx>]

! Live-CD: pci muss auch noch auf das Floppyimage und beim Booten
  geladen werden, ansonsten wartet ata auf einen Timeout
! grub_hd.cfg: pci sollte als Startup-Service deklariert sein

Signed-off-by: Kevin Wolf <kevin@xxxxxxxxxx>
---
 build/config/grub_cdrom.cfg |    6 ++++--
 build/config/grub_hd.cfg    |    4 ++--
 build/scripts/image_cdrom   |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/config/grub_cdrom.cfg b/build/config/grub_cdrom.cfg
index 8949215..e0de5e3 100644
--- a/build/config/grub_cdrom.cfg
+++ b/build/config/grub_cdrom.cfg
@@ -1,21 +1,23 @@
 title tyndur (Deutsch)
 kernel /tyndur debug=s
 module /init boot=file:/
+module /pci
 module /ata
 module /iso9660
 module /ramoverlay
 module /ext2
 module /console servmgr:/term servmgr:/term
-module /servmgr ata:/atapi10|iso9660:/hd.img|ramoverlay:/cached|ext2:/ vterm:/vterm8/out ata iso9660 console ramoverlay ext2
+module /servmgr ata:/atapi10|iso9660:/hd.img|ramoverlay:/cached|ext2:/ vterm:/vterm8/out ata iso9660 console ramoverlay ext2 pci
 boot
 
 title tyndur (English)
 kernel /tyndur debug=s
 module /init boot=file:/ env.LANG=en
+module /pci
 module /ata
 module /iso9660
 module /ramoverlay
 module /ext2
 module /console servmgr:/term servmgr:/term
-module /servmgr ata:/atapi10|iso9660:/hd.img|ramoverlay:/cached|ext2:/ vterm:/vterm8/out ata iso9660 console ramoverlay ext2
+module /servmgr ata:/atapi10|iso9660:/hd.img|ramoverlay:/cached|ext2:/ vterm:/vterm8/out ata iso9660 console ramoverlay ext2 pci
 boot
diff --git a/build/config/grub_hd.cfg b/build/config/grub_hd.cfg
index 97e88c3..74c2133 100644
--- a/build/config/grub_hd.cfg
+++ b/build/config/grub_hd.cfg
@@ -5,7 +5,7 @@ module /modules/pci
 module /modules/ata
 module /modules/ext2
 module /modules/console servmgr:/term servmgr:/term
-module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console
+module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci
 boot
 
 title tyndur (English)
@@ -15,5 +15,5 @@ module /modules/pci
 module /modules/ata
 module /modules/ext2
 module /modules/console servmgr:/term servmgr:/term
-module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console
+module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci
 boot
diff --git a/build/scripts/image_cdrom b/build/scripts/image_cdrom
index 3cfe5c8..23c78f8 100755
--- a/build/scripts/image_cdrom
+++ b/build/scripts/image_cdrom
@@ -121,7 +121,7 @@ mcopy -D o build/config/grub_cdrom.cfg l:/boot/grub/menu.lst
 # Die noetigsten Treiber auf das Floppy-Image packen
 mcopy -D o $ROOT/boot/tyndur $ROOT/modules/init $ROOT/modules/console l:/
 mcopy -D o $ROOT/modules/ata $ROOT/modules/iso9660 $ROOT/modules/servmgr l:/
-mcopy -D o $ROOT/modules/ext2 $ROOT/modules/ramoverlay l:/
+mcopy -D o $ROOT/modules/ext2 $ROOT/modules/ramoverlay $ROOT/modules/pci l:/
 
 # Konfigurationsdatei fuer mtools wieder loeschen
 rm -f $MTOOLSRC
-- 
1.6.0.2