projects
/
grml-rescueboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.6.1
[grml-rescueboot.git]
/
42_grml
diff --git
a/42_grml
b/42_grml
index
e8e8200
..
7b96e6b
100755
(executable)
--- a/
42_grml
+++ b/
42_grml
@@
-93,6
+93,13
@@
for file in "${ISO_LOCATION}"/*.iso ; do
fi
done
fi
done
+indent=' '
+submenu_indent=
+if [ -n "${GRUB_SUBMENU}" ] && [ -n "${iso_list}" ] ; then
+ echo "submenu \"${GRUB_SUBMENU}\" \$menuentry_id_option \"grml-rescueboot\" {"
+ submenu_indent="${indent}"
+fi
+
for grmliso in $iso_list ; do
rel_dirname="$(dirname $(make_system_path_relative_to_its_root $grmliso))"
grml="$(basename $grmliso)"
for grmliso in $iso_list ; do
rel_dirname="$(dirname $(make_system_path_relative_to_its_root $grmliso))"
grml="$(basename $grmliso)"
@@
-117,29
+124,39
@@
for grmliso in $iso_list ; do
;;
esac
;;
esac
- echo "Found
Grml ISO image: $grmliso
" >&2
+ echo "Found
grml-rescueboot ISO image: ${grmliso}
" >&2
iso_id=$(get_iso_identifier "${grmliso}")
if [ -n "${iso_id}" ] ; then
title="${iso_id} (${grml})"
else
iso_id=$(get_iso_identifier "${grmliso}")
if [ -n "${iso_id}" ] ; then
title="${iso_id} (${grml})"
else
- title="
Grml Rescue System (${grml})
"
+ title="
${grml}
"
fi
fi
- grub_prep=$(prepare_grub_to_access_device "$device" | sed -e "s/^/ /")
+ grub_prep=$(prepare_grub_to_access_device "${device}" | sed -e "s/^/${indent}/")
+ grub_iso_path="${rel_dirname%/}/${grml}"
-
cat
<< EOF
+
sed -e "s/^/${submenu_indent}/"
<< EOF
menuentry "${title}" {
${grub_prep}
menuentry "${title}" {
${grub_prep}
- iso_path="${
rel_dirname%/}/${grml
}"
+ iso_path="${
grub_iso_path
}"
export iso_path
kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
export kernelopts
# support booting recent GRUB versions on UEFI systems
export iso_path
kernelopts=" $CUSTOM_BOOTOPTIONS $additional_param "
export kernelopts
# support booting recent GRUB versions on UEFI systems
+ # (see bugs.debian.org/959425)
rmmod tpm
rmmod tpm
- loopback loop "
${rel_dirname%/}/$grml
"
+ loopback loop "
\$iso_path
"
set root=(loop)
configfile /boot/grub/loopback.cfg
set root=(loop)
configfile /boot/grub/loopback.cfg
+ unset root
+ loopback -d loop
+ unset iso_path
+ unset kernelopts
}
EOF
done
}
EOF
done
+if [ -n "${GRUB_SUBMENU}" ] && [ -n "${iso_list}" ] ; then
+ echo "} # end submenu \"${GRUB_SUBMENU}\""
+fi
+
## END OF FILE #################################################################
## END OF FILE #################################################################