From: Joachim Henke <free.software@gmx.com>
Date: Sat, 15 Dec 2012 12:59:08 +0000 (+0100)
Subject: ramdisk: add virtio-blk to proto and boot option
X-Git-Tag: v3.2.1~85
X-Git-Url: http://zhaoyanbai.com/repos/%24relpath%24tabs.css?a=commitdiff_plain;h=eddc5dd5819f4f2167c2a6289051e7664272a5cb;p=minix.git

ramdisk: add virtio-blk to proto and boot option
---

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index dc38cf47c..65b2214ee 100644
--- 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 ba7989ae5..9ca3f192a 100644
--- 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 8cc64e14d..895f80d1b 100755
--- 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