1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 07_support_findiso.dpatch by Michael Schierl <schierlm@gmx.de>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: support for findoiso bootoption
6 # When booting with findiso=/grml_2010.05.iso, it will look for
7 # that .iso file on all disks where it usually looks for the .squashfs
8 # file. When it is found, the disk containing the iso is read-only mounted
9 # as /live/findiso (and exposed there after boot completed). The squashfs
10 # file is searched inside that ISO file then.
14 ===================================================================
15 --- a/scripts/live 2011-07-24 22:07:54.000000000 +0200
16 +++ b/scripts/live 2011-07-24 22:07:58.000000000 +0200
22 + FINDISO="${ARGUMENT#findiso=}"
27 FORCEPERSISTENTFSCK="Yes"
28 export FORCEPERSISTENTFSCK
29 @@ -1629,13 +1634,28 @@
30 mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
31 [ -n "$devuid" ] && echo "$devuid" >> $tried
33 + if [ -n "${FINDISO}" ]
35 + if [ -f ${mountpoint}/${FINDISO} ]
37 + umount ${mountpoint}
38 + mkdir /live/findiso -p
39 + mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
40 + loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
41 + devname="${loopdevname}"
42 + mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
44 + umount ${mountpoint}
48 if is_live_path ${mountpoint} && \
49 ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
54 - umount ${mountpoint}
55 + umount ${mountpoint} 2>/dev/null
59 @@ -1933,6 +1953,22 @@
60 # when booting FAI, this simple workaround solves it
61 ls /root/* >/dev/null 2>&1
63 + # Move findiso directory to the new root filesystem so that programs there can get at it.
64 + if [ -d /live/findiso -a ! -d /root/live/findiso ]
66 + mkdir -p /root/live/findiso
67 + mount -n --move /live/findiso /root/live/findiso
70 + # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
71 + # because the mountpoint is left behind in /proc/mounts, so let's get
72 + # rid of it when running from RAM
73 + if [ -n "$FINDISO" ] && [ "${TORAM}" ]
75 + losetup -d /dev/loop0
76 + grep -q /live/findiso /proc/mounts && umount /root/live/findiso
79 # copy snapshot configuration if exists
80 if [ -f snapshot.conf ]