X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmountsource.sh;h=f7012b1e05b38320462217ea19fb78416e3392d9;hp=b30fb15eb4e7e5652cb5c8965ec5b8825fb7cf16;hb=1a8688ba59e21e3e1a1a8651e36e0d51de0815be;hpb=4809e64e27463b090e8064b2d16533436c16ee2c diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index b30fb15eb..f7012b1e0 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -4,7 +4,7 @@ echo "Scanning source media" # scan CDROM devices -for DEVICE in $(hwinfo --cdrom | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do +for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE} /cdrom 2> /dev/null if [ -e /cdrom/boot ]; then echo -n ${DEVICE} > /tmp/source_device @@ -14,7 +14,7 @@ for DEVICE in $(hwinfo --cdrom | grep "Device File" | awk -F: '{ print $2 }' | c done # scan HD device (usb sticks, etc.) -for DEVICE in $(hwinfo --usb --disk | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do +for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do mount /dev/${DEVICE}1 /cdrom 2> /dev/null if [ -e /cdrom/boot ]; then echo -n ${DEVICE}1 > /tmp/source_device