From c0ff149c5468e0643c3b845ff8e9ca01f5729b24 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 25 Sep 2008 17:04:02 +0000 Subject: pass opts to get_default_append --- draklive | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/draklive b/draklive index f681b64..79c3de3 100755 --- a/draklive +++ b/draklive @@ -697,7 +697,7 @@ sub create_classical_initrd { } sub get_default_append { - my ($live) = @_; + my ($live, $opts) = @_; join(' ', if_(!need_media_specific_boot($live), 'root=' . get_media_source_for_nash($live->{media})), @@ -716,7 +716,7 @@ my @syslinux_boot_files = qw(/vmlinuz /syslinux/bootlogo /help.msg); sub build_syslinux_cfg { my ($live, $media, $opts) = @_; - my $append = get_default_append($live); + my $append = get_default_append($live, $opts); #- syslinux wants files at root (used with vfat fs) my $to_root = get_boot_setting($media, 'fs', $opts) eq 'vfat'; my $boot = get_media_prefix($live, 'boot', $opts->{boot}); @@ -761,7 +761,7 @@ sub build_grub_cfg_raw { (map { my ($name, $cmdline) = @$_; "title " . $live->{media}{title} . if_($name, " ($name)"), - "kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live) . if_($cmdline, " $cmdline"), + "kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live, $opts) . if_($cmdline, " $cmdline"), "initrd " . $boot . $initrd; } group_by2('' => '', @{$live->{system}{boot_entries}})), "", -- cgit v1.2.1