ramdisk: add virtio-blk to proto and boot option

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index dc38cf47cdc9b4171146d8fb42beebe00a47c03a..65b2214ee38d6807bd635dd6d467f8045d8a4ed5 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -44,6 +44,7 @@ PROG_USRSBIN+=        pwd_mkdb
 .if ${MKSMALL} != "yes"
 RAMDISK_SMALL= 1
 PROG_DRIVERS+= ahci
+PROG_DRIVERS+= virtio_blk
 PROG_SERVERS+= ext2
 .endif
 

diff --git a/drivers/ramdisk/proto b/drivers/ramdisk/proto
index ba7989ae5c3c7b4e46b56837a97d5216df58c5b1..9ca3f192a7660c62b4cfe4895898cea6d4ca13a9 100644 (file)
--- a/drivers/ramdisk/proto
+++ b/drivers/ramdisk/proto
@@ -14,6 +14,7 @@ d--755 0 0
        sbin d--755 0 0
                floppy ---755 0 0 floppy
                ahci ---755 0 0 ahci
+               virtio_blk ---755 0 0 virtio_blk
                at_wini ---755 0 0 at_wini
 #if RAMDISK_SMALL == 1
                ext2 ---755 0 0 ext2

diff --git a/drivers/ramdisk/rc b/drivers/ramdisk/rc
index 8cc64e14db01eac916ef68b8e4a4fd42027b288b..895f80d1b5ed1c2d5d06eb034b91eeb200f570e2 100755 (executable)
--- a/drivers/ramdisk/rc
+++ b/drivers/ramdisk/rc
@@ -17,6 +17,9 @@ if [ X`/bin/sysenv ahci` = Xyes ]
 then
        # this is here temporarily, for testing purposes
        /bin/service -c up /sbin/ahci -dev /dev/c0d0 -label ahci_0 -args instance=0
+elif [ X`/bin/sysenv virtio_blk` = Xyes ]
+then
+       /bin/service -c up /sbin/virtio_blk -dev /dev/c0d0 -label virtio_blk_0 -args instance=0
 else
        /bin/service -c up /sbin/at_wini -dev /dev/c0d0 -label at_wini_0
        /bin/service -cr up /sbin/at_wini -dev /dev/c1d0 -label at_wini_1 -args instance=1