Skip to content
Browse files

extract ISO feature: make sure *.squashfs files exist + support older…

… ISOs too

ISOs before release 2011.12 used /live/ for storing squashfs files,
releases starting with 2011.12 use /live/*/ (where "*" corresponds
to the release name). Test whether such files exist before accessing
them and while adding the check also add support for releases older
than 2011.12.

Thanks: Charles A. Hewson <cahewson@eskimo.com> for the bugreport
  • Loading branch information...
1 parent 63cf502 commit a7f99c464099634bbb5472b5889430f84f1fe9f5 @mika mika committed
Showing with 14 additions and 1 deletion.
  1. +14 −1 grml-live
View
15 grml-live
@@ -553,7 +553,20 @@ if [ -n "$EXTRACT_ISO_NAME" ]; then
eend 1
bailout 1
fi
- unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*/*.squashfs ; rc=$?
+
+ if ls "${mountpoint}"/live/*/*.squashfs 2>/dev/null | grep -q . ; then # ISOs >=2011.12
+ log "Using ${mountpoint}/live/*/*.squashfs for unsquashfs"
+ unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*/*.squashfs ; rc=$?
+ elif ls "${mountpoint}"/live/*.squashfs 2>/dev/null | grep -q . ; then # ISOs before 2011.12
+ log "Using ${mountpoint}/live/*.squashfs for unsquashfs"
+ unsquashfs -d "${CHROOT_OUTPUT}" "${mountpoint}"/live/*.squashfs ; rc=$?
+ else
+ log "Error: Could not find any *.squashfs files on the ISO"
+ eerror "Error: Could not find any *.squashfs files on the ISO"
+ eend 1
+ bailout 1
+ fi
+
umount "$mountpoint"
rmdir "$mountpoint"
if [ "$rc" != 0 ]; then

0 comments on commit a7f99c4

Please sign in to comment.
Something went wrong with that request. Please try again.