From: Heiko Z. <smi...@us...> - 2015-12-27 21:29:44
|
Update of /cvsroot/devil-linux/build/config/etc/initrd In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8116 Modified Files: linuxrc mount_cdrom Log Message: make outputs nicer print list of config devices that are going to be searched Index: linuxrc =================================================================== RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- linuxrc 6 Oct 2015 00:59:14 -0000 1.116 +++ linuxrc 27 Dec 2015 21:29:42 -0000 1.117 @@ -296,6 +296,10 @@ CONFIG_SRC_LIST="$DISCS_RAID $DISCS_VIRTIO $DISCS_SCSI $DEVICES_IDE $CDROM_SCSI $FLOPPIES" CONFIG_FILE="etc-mods.tar.bz2" +$GREEN +echo "Search list: $CONFIG_SRC_LIST" +$NORMAL + CDROMS=$(grep -i "drive name" /proc/sys/dev/cdrom/info) # search for configuration information Index: mount_cdrom =================================================================== RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- mount_cdrom 26 Dec 2015 23:54:06 -0000 1.58 +++ mount_cdrom 27 Dec 2015 21:29:42 -0000 1.59 @@ -308,7 +308,7 @@ # generate list of cdroms from devfs DEVICES_IDE=`find /dev -name "hd?" 2> /dev/null` CDROM_SCSI=`find /dev -name "sr?" 2> /dev/null` -CDROMS="$DEVICES_IDE $CDROM_SCSI" +CDROMS=`echo $DEVICES_IDE $CDROM_SCSI | tr '\n' ' '` DEVICE_USER=`awk -v RS=' ' -v FS='=' '/^DL_device=/ { print $2 }' /proc/cmdline` DEVICE_USER_ONLY=`grep -c DL_device /proc/cmdline` @@ -385,7 +385,7 @@ CDROM_SCSI=`find /dev -name "sr?" 2> /dev/null` DISCS_SCSI=`find /dev -name "sd??" 2> /dev/null` DEVICES_VIRTIO=`find /dev -name "vd??" 2> /dev/null` -DISCS="$DEVICES_VIRTIO $DEVICES_IDE $CDROM_IDE $CDROM_SCSI $DISCS_SCSI" +DISCS=`echo $DEVICES_VIRTIO $DEVICES_IDE $CDROM_IDE $CDROM_SCSI $DISCS_SCSI | tr '\n' ' '` FILEMOUNT="/cd" if [ ! $silent ]; then |