From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 15 Aug 2009 19:56:45 +0000 (+0200)
Subject: Add virtio blockdevice drivers to initramdisk
X-Git-Tag: v2.5-core30~25
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=98220a3233ee07df0e25129a7ec6d6ede6d0a680

Add virtio blockdevice drivers to initramdisk
---

diff --git a/config/mkinitcpio/virtio b/config/mkinitcpio/virtio
new file mode 100644
index 0000000000..0ba99d3491
--- /dev/null
+++ b/config/mkinitcpio/virtio
@@ -0,0 +1,24 @@
+# vim: set ft=sh:
+
+install ()
+{
+    MODULES=" $(checked_modules "block/virtio_blk") "
+
+    MODULES=$(echo ${MODULES}) #trim whitespace
+    if [ "x${MODULES}" != "x" ]; then
+        MODULES="${MODULES} virtio_pci"
+    fi
+
+    BINARIES=""
+    FILES=""
+    SCRIPT=""
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an virtio root device.
+  Detection will take place at runtime. To minimize the modules
+  in the image, add the autodetect hook too.
+HELPEOF
+}
diff --git a/config/rootfiles/common/mkinitcpio b/config/rootfiles/common/mkinitcpio
index 6db7667b11..fc658cf71b 100644
--- a/config/rootfiles/common/mkinitcpio
+++ b/config/rootfiles/common/mkinitcpio
@@ -27,6 +27,7 @@ lib/initcpio
 #lib/initcpio/install/resume
 #lib/initcpio/install/sata
 #lib/initcpio/install/scsi
+#lib/initcpio/install/virtio
 #lib/initcpio/install/usb
 #lib/initcpio/install/usbinput
 sbin/mkinitcpio
diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
index 0251d57866..c7dc4b6055 100644
--- a/lfs/mkinitcpio
+++ b/lfs/mkinitcpio
@@ -71,8 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./install.sh ""
+	cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
 	sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
-	sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf
+	sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
 	sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
 	sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide