From 7a56ca059406e79a536d3434b4117cc4a0720696 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <ch@grml.org>
Date: Fri, 22 Nov 2024 21:25:38 +0100
Subject: [PATCH] grml-live: use xorriso instead of mount -o loop in -e mode

mount -o loop is disabled in our new build environment, so avoid that
and use xorriso (actually, osirrox) to extract the squashfs file from
the ISO.
---
 grml-live | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/grml-live b/grml-live
index 07a0c043..389a1590 100755
--- a/grml-live
+++ b/grml-live
@@ -637,23 +637,21 @@ extract_iso() {
 if [ -n "$EXTRACT_ISO_NAME" ]; then
   log "Unpacking ISO from ${EXTRACT_ISO_NAME}"
   einfo "Unpacking ISO from ${EXTRACT_ISO_NAME}"
-  local mountpoint=$(mktemp -d)
+  local tempdir=$(mktemp -d)
   local rc=0
-  mount -o loop "${EXTRACT_ISO_NAME}" "$mountpoint" ; rc=$?
+  mkdir -p "${tempdir}/live/"
+  osirrox -indev "${EXTRACT_ISO_NAME}" -extract live "${tempdir}/live/" ; rc=$?
   if [ "$rc" != 0 ]; then
-    rmdir "$mountpoint"
-    log "mount failed"
-    eerror "mount failed"
+    rm -rf "$tempdir"
+    log "osirrox failed"
+    eerror "osirrox failed"
     eend 1
     bailout 1
   fi
 
-  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=$?
+  if ls "${tempdir}"/live/*/*.squashfs 2>/dev/null | grep -q . ; then
+    log "Using ${tempdir}/live/*/*.squashfs for unsquashfs"
+    unsquashfs -d "${CHROOT_OUTPUT}" "${tempdir}"/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"
@@ -661,8 +659,7 @@ if [ -n "$EXTRACT_ISO_NAME" ]; then
     bailout 1
   fi
 
-  umount "$mountpoint"
-  rmdir "$mountpoint"
+  rm -rf "$tempdir"
   if [ "$rc" != 0 ]; then
     log "unsquashfs failed"
     eerror "unsquashfs failed"