|
From: Serge L. <sma...@us...> - 2010-03-18 05:54:43
|
Update of /cvsroot/devil-linux/build/config/etc/initrd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24283/config/etc/initrd Modified Files: linuxrc mount_cdrom Log Message: - added virtio support Index: linuxrc =================================================================== RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- linuxrc 21 Feb 2009 00:47:01 -0000 1.107 +++ linuxrc 18 Mar 2010 05:54:35 -0000 1.108 @@ -239,6 +239,12 @@ # we load the module to be sure we will be able to mount iso image modprobe loop > /dev/null 2>&1 +# virtio +if grep QEMU /proc/cpuinfo > /dev/null ; then + modprobe virtio_pci + modprobe virtio_blk +fi + # we load the modules based on information from sysfs for mod in $(find /sys/devices -name modalias -exec cat {} \; | sed 's/sv.*sd.*bc.*sc.*i*.//' ); do @@ -272,8 +278,9 @@ DEVICES_IDE=`find /dev -name "hd*" 2> /dev/null` CDROM_SCSI=`find /dev -name "sr*" 2> /dev/null` DISCS_SCSI=`find /dev -name "sd*" 2> /dev/null` +DISCS_VIRTIO=`find /dev -name "vd*" 2> /dev/null` FLOPPIES=`find /dev -name "fd*" 2> /dev/null` -CONFIG_SRC_LIST="$DISCS_SCSI $DEVICES_IDE $CDROM_SCSI $FLOPPIES" +CONFIG_SRC_LIST="$DISCS_VIRTIO $DISCS_SCSI $DEVICES_IDE $CDROM_SCSI $FLOPPIES" CONFIG_FILE="etc-mods.tar.bz2" CDROMS=$(grep -i "drive name" /proc/sys/dev/cdrom/info) Index: mount_cdrom =================================================================== RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- mount_cdrom 5 Nov 2009 05:12:03 -0000 1.51 +++ mount_cdrom 18 Mar 2010 05:54:35 -0000 1.52 @@ -353,7 +353,8 @@ # ok let's check all partitions if we find the bootcd.iso & the file DEVIL-LINUX DEVICES_IDE=`find /dev -name "hd??" 2> /dev/null` DISCS_SCSI=`find /dev -name "sd??" 2> /dev/null` -DISCS="$DEVICES_IDE $DISCS_SCSI" +DEVICES_VIRTIO=`find /dev -name "vd??" 2> /dev/null` +DISCS="$DEVICES_VIRTIO $DEVICES_IDE $DISCS_SCSI" FILEMOUNT="/cd" if [ "$DEVICE_USER_ONLY" != "0" ]; then |