diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-09-25 17:04:02 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-09-25 17:04:02 +0000 |
commit | c0ff149c5468e0643c3b845ff8e9ca01f5729b24 (patch) | |
tree | 444e0879595a8acba34acdc6a9c346150ba2e371 | |
parent | f0181458b3ecb8f22f530a4178d7189bf5af4f32 (diff) | |
download | drakiso-c0ff149c5468e0643c3b845ff8e9ca01f5729b24.tar drakiso-c0ff149c5468e0643c3b845ff8e9ca01f5729b24.tar.gz drakiso-c0ff149c5468e0643c3b845ff8e9ca01f5729b24.tar.bz2 drakiso-c0ff149c5468e0643c3b845ff8e9ca01f5729b24.tar.xz drakiso-c0ff149c5468e0643c3b845ff8e9ca01f5729b24.zip |
pass opts to get_default_append
-rwxr-xr-x | draklive | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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}})), "", |