if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
echo -n ${DEVICE} > /tmp/source_device
echo "Found tarball on ${DEVICE}"
+ exit 0
else
echo "Found no tarballs on ${DEVICE} - SKIP"
fi
umount /cdrom 2> /dev/null
done
-# scan HD device unpart (usb sticks, etc.)
+# 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} /cdrom 2> /dev/null
+ mount /dev/${DEVICE}1 /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
- echo -n ${DEVICE} > /tmp/source_device
- echo "Found tarball on ${DEVICE}"
+ echo -n ${DEVICE}1 > /tmp/source_device
+ echo "Found tarball on ${DEVICE}1"
+ exit 0
else
- umount /cdrom 2> /dev/null
- echo "Found no tarballs on ${DEVICE} - SKIP"
+ echo "Found no tarballs on ${DEVICE}1 - SKIP"
fi
umount /cdrom 2> /dev/null
done
-# scan HD device part1 (usb sticks, etc.)
+# scan HD device unpart (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
+ mount /dev/${DEVICE} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
- echo -n ${DEVICE}1 > /tmp/source_device
- echo "Found tarball on ${DEVICE}1"
+ echo -n ${DEVICE} > /tmp/source_device
+ echo "Found tarball on ${DEVICE}"
+ exit 0
else
- umount /cdrom 2> /dev/null
echo "Found no tarballs on ${DEVICE} - SKIP"
fi
umount /cdrom 2> /dev/null
done
-if [ -e "/tmp/source_device" ]; then
- mount /dev/$(cat /tmp/source_device) /cdrom 2> /dev/null
- exit 0
-else
- exit 10
-fi
+exit 10