From e5a68aecf4eded22d23059029f9a65ab5681addf Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Fri, 25 Mar 2011 18:25:29 +0100 Subject: [PATCH] Refactored 42_grml and support lvm devices [Closes: issue971]. --- 42_grml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/42_grml b/42_grml index 6913346..68ba01d 100755 --- a/42_grml +++ b/42_grml @@ -21,23 +21,35 @@ if [ -r /etc/default/grml-rescueboot ] ; then . /etc/default/grml-rescueboot fi -list=$(for i in "${ISO_LOCATION}"/*.iso ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done) +iso_list="" +for file in "${ISO_LOCATION}"/*.iso ; do + if grub_file_is_not_garbage "$file" ; then + iso_list="$iso_list $file " + fi +done -for grmliso in $list ; do +for grmliso in $iso_list ; do rel_dirname="$(make_system_path_relative_to_its_root $(dirname $grmliso))" grml="$(basename $grmliso)" + device="$(${grub_probe} -t device ${grmliso})" + + additional_param="" + + case "$device" in + *mapper* ) + additional_param="live-media=$device" + ;; + esac echo "Found Grml ISO image: $grmliso" >&2 title="Grml Rescue System ($grml)" cat << EOF menuentry "${title}" { -$(prepare_grub_to_access_device $(${grub_probe} -t device ${grmliso}) | sed -e "s/^/ /") +$(prepare_grub_to_access_device "$device" | sed -e "s/^/ /") iso_path="${rel_dirname}/${grml}" export iso_path - kernelopts="$CUSTOM_BOOTOPTIONS" + kernelopts="$CUSTOM_BOOTOPTIONS $additional_param" export kernelopts loopback loop "${rel_dirname}/$grml" set root=(loop) -- 2.1.4