projects
/
grml-rescueboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try using isoinfo(1) to extract an ISO image identifier
[grml-rescueboot.git]
/
42_grml
diff --git
a/42_grml
b/42_grml
index
8cfdb3f
..
e8e8200
100755
(executable)
--- a/
42_grml
+++ b/
42_grml
@@
-74,10
+74,17
@@
get_dependencies() {
break
done
echo $dependencies
break
done
echo $dependencies
-
}
}
-
+get_iso_identifier() {
+ local iso="$1"
+ local id=
+ if isoinfo --version >/dev/null 2>&1 ; then
+ id=$(isoinfo -d -i "${iso}" | grep '^Volume id:' | sed -e 's/^[^:]*: *//')
+ [ -n "${id}" ] || id=$(isoinfo -d -i "${iso}" | grep '^Application id:' | sed -e 's/^[^:]*: *//')
+ fi
+ echo "${id}"
+}
iso_list=""
for file in "${ISO_LOCATION}"/*.iso ; do
iso_list=""
for file in "${ISO_LOCATION}"/*.iso ; do
@@
-87,7
+94,7
@@
for file in "${ISO_LOCATION}"/*.iso ; do
done
for grmliso in $iso_list ; do
done
for grmliso in $iso_list ; do
- rel_dirname="$(
make_system_path_relative_to_its_root $(dirname
$grmliso))"
+ rel_dirname="$(
dirname $(make_system_path_relative_to_its_root
$grmliso))"
grml="$(basename $grmliso)"
device="$(${grub_probe} -t device ${grmliso})"
grml="$(basename $grmliso)"
device="$(${grub_probe} -t device ${grmliso})"
@@
-98,6
+105,11
@@
for grmliso in $iso_list ; do
dependencies=$(get_dependencies ${device})
dep_string=""
for dep in $dependencies $device ; do
dependencies=$(get_dependencies ${device})
dep_string=""
for dep in $dependencies $device ; do
+ case "$dep" in
+ /dev/md*)
+ md_name="$(mdadm --detail --export "$dep" | sed -ne 's/MD_NAME=//p')"
+ dep="/dev/md/$md_name"
+ esac
dep_string="$dep_string,$dep"
done
dep_string=${dep_string#,}
dep_string="$dep_string,$dep"
done
dep_string=${dep_string#,}
@@
-106,17
+118,24
@@
for grmliso in $iso_list ; do
esac
echo "Found Grml ISO image: $grmliso" >&2
esac
echo "Found Grml ISO image: $grmliso" >&2
- title="Grml Rescue System ($grml)"
+ iso_id=$(get_iso_identifier "${grmliso}")
+ if [ -n "${iso_id}" ] ; then
+ title="${iso_id} (${grml})"
+ else
+ title="Grml Rescue System (${grml})"
+ fi
grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/ /")
cat << EOF
menuentry "${title}" {
${grub_prep}
grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/ /")
cat << EOF
menuentry "${title}" {
${grub_prep}
- iso_path="${rel_dirname}/${grml}"
+ iso_path="${rel_dirname
%/
}/${grml}"
export iso_path
kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
export kernelopts
export iso_path
kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
export kernelopts
- loopback loop "${rel_dirname}/$grml"
+ # support booting recent GRUB versions on UEFI systems
+ rmmod tpm
+ loopback loop "${rel_dirname%/}/$grml"
set root=(loop)
configfile /boot/grub/loopback.cfg
}
set root=(loop)
configfile /boot/grub/loopback.cfg
}