summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-08-04 00:02:01 +0000
committerOlivier Blin <oblin@mandriva.com>2009-08-04 00:02:01 +0000
commit818601fdcb49bc0c886690f8f83b67949c6ed6dd (patch)
tree3c2aaad490b6234d5f3323088382e280e0dabed2
parent673d099517518ad01f256794be29bae8b216a032 (diff)
downloaddraklive-818601fdcb49bc0c886690f8f83b67949c6ed6dd.tar
draklive-818601fdcb49bc0c886690f8f83b67949c6ed6dd.tar.gz
draklive-818601fdcb49bc0c886690f8f83b67949c6ed6dd.tar.bz2
draklive-818601fdcb49bc0c886690f8f83b67949c6ed6dd.tar.xz
draklive-818601fdcb49bc0c886690f8f83b67949c6ed6dd.zip
do not vivify live->{oem_rescue}
-rwxr-xr-xdraklive4
1 files changed, 2 insertions, 2 deletions
diff --git a/draklive b/draklive
index 1a17749..6aae36e 100755
--- a/draklive
+++ b/draklive
@@ -131,12 +131,12 @@ sub build_grub_cfg_raw {
"kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live, $opts) . if_($cmdline, " $cmdline"),
if_($initrd, "initrd " . $boot . $initrd);
} group_by2('' => '', @{$live->{system}{boot_entries}})),
- if_(defined $opts->{oem_rescue_idx},
+ ($live->{oem_rescue} && defined $opts->{oem_rescue_idx} ? (
#- FIXME: factorize with above, build_grub_cfg_entry($media)
"title " . $live->{oem_rescue}{media}{title},
"kernel (hd0,$opts->{oem_rescue_idx})" . $boot . "/vmlinuz " . $live->{oem_rescue}{append},
"initrd (hd0,$opts->{oem_rescue_idx})" . $boot . $media->get_initrd_path,
- ),
+ ) : ()),
"",
);
}