[SCM] debian-live/live-initramfs branch, master, updated. 1.125.1-1-7-g39f6aa4
Chris Lamb
chris at chris-lamb.co.uk
Wed Mar 26 08:57:07 UTC 2008
The following commit has been merged in the master branch:
commit 9a8944da64baaf12bf9c52ca3ede2941a0513804
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Wed Mar 26 08:08:10 2008 +0000
scripts/live-helpers: Search / use case
This patch extends the find_files and find_cow_device utilities to search
known-working partition types (removing two "FIXME"s) and reworks the
syntax to use somewhat more readable case-statements.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 771ab85..6c03751 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -244,20 +244,24 @@ find_cow_device ()
then
echo "${devname}"
return
- elif [ "$(get_fstype ${devname})" = "vfat" ]
- then
- # FIXME: all supported block devices should be scanned
- mkdir -p "${cow_backing}"
- try_mount "${devname}" "${cow_backing}" "rw"
-
- if [ -e "${cow_backing}/${pers_label}" ]
- then
- echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
- return 0
- else
- umount ${cow_backing}
- fi
fi
+
+ case "$(get_fstype ${devname})" in
+ vfat|ext2|ext3|jffs2)
+ mkdir -p "${cow_backing}"
+ try_mount "${devname}" "${cow_backing}" "rw"
+
+ if [ -f "${cow_backing}/${pers_label}" ]
+ then
+ echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+ return 0
+ else
+ umount ${cow_backing}
+ fi
+ ;;
+ *)
+ ;;
+ esac
done
done
}
@@ -277,23 +281,24 @@ find_files ()
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
- if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] || [ "${devfstype}" = "jffs2" ]
- then
- # FIXME: all supported block devices should be scanned
- mkdir -p "${snap_backing}"
- try_mount "${devname}" "${snap_backing}" "ro"
-
- for filename in ${filenames}
- do
- if [ -e "${snap_backing}/${filename}" ]
- then
- echo "${devname} ${snap_backing} ${filename}"
- return 0
- fi
- done
-
- umount ${snap_backing}
- fi
+ case "${devfstype}" in
+ vfat|ext2|ext3|jffs2)
+ # FIXME: all supported block devices should be scanned
+ mkdir -p "${snap_backing}"
+ try_mount "${devname}" "${snap_backing}" "ro"
+
+ for filename in ${filenames}
+ do
+ if [ -f "${snap_backing}/${filename}" ]
+ then
+ echo "${devname} ${snap_backing} ${filename}"
+ return 0
+ fi
+ done
+
+ umount ${snap_backing}
+ ;;
+ esac
done
done
}
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list