From 732447b9b3a188ac4f50b4902efaa854c2fba176 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 8 Feb 2012 22:37:09 +0100 Subject: [PATCH] installer: Enhance mountsource.sh script. Searches for installation images on all partitions on external media. References bug #10020. --- src/install+setup/install/mountsource.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index bb7a7e2fd..681375877 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -36,15 +36,17 @@ done # scan HD device part1 (usb sticks, etc.) 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 + for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///");do + mount /dev/${DEVICEP} /cdrom 2> /dev/null if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then - echo -n ${DEVICE}1 > /tmp/source_device - echo "Found tarball on ${DEVICE}1" + echo -n ${DEVICEP} > /tmp/source_device + echo "Found tarball on ${DEVICEP}" exit 0 else - echo "Found no tarballs on ${DEVICE}1 - SKIP" + echo "Found no tarballs on ${DEVICEP} - SKIP" fi umount /cdrom 2> /dev/null + done done # scan HD device unpart (usb sticks, etc.) -- 2.39.2