diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 02:12:22 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 02:12:22 +0000 |
commit | 467534e0a4b0f9fb6cac6f532bd60defe8077b0a (patch) | |
tree | 83cb738704f4eabd4b2ac35a89f5fe029734276b /make_boot_img | |
parent | ea702f7bb74dd098730c3792871af63b41cdb565 (diff) | |
download | drakx-backup-do-not-use-467534e0a4b0f9fb6cac6f532bd60defe8077b0a.tar drakx-backup-do-not-use-467534e0a4b0f9fb6cac6f532bd60defe8077b0a.tar.gz drakx-backup-do-not-use-467534e0a4b0f9fb6cac6f532bd60defe8077b0a.tar.bz2 drakx-backup-do-not-use-467534e0a4b0f9fb6cac6f532bd60defe8077b0a.tar.xz drakx-backup-do-not-use-467534e0a4b0f9fb6cac6f532bd60defe8077b0a.zip |
- since we don't use a ramdisk for the stage2 anymore, remove ramdisk_size=128000
(hopefully the initrd doesn't have the limitation or we won't hit the stupid low default max size of the kernel)
- use the short aliases for automatic stage1 (cf mdk-stage1/automatic.c)
Diffstat (limited to 'make_boot_img')
-rwxr-xr-x | make_boot_img | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/make_boot_img b/make_boot_img index 470b9dd60..54cc781a9 100755 --- a/make_boot_img +++ b/make_boot_img @@ -5,7 +5,7 @@ use MDK::Common; Config->import; my ($arch) = $Config{archname} =~ /(.*?)-/; -my $default_append = "ramdisk_size=128000"; +my $default_append = ''; # full acpi support for x86_64, enough acpi support for x86 ht, no acpi for others my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "" : "acpi=off"; my $default_vga = "vga=788 splash=silent"; @@ -137,6 +137,7 @@ F3 boot.msg EOF my @l = map { + $_->{append} =~ s/\s+/ /g; "label $_->{label}\n" . " kernel $_->{kernel}\n" . ($_->{initrd} ? " append initrd=$_->{initrd} $_->{append}\n" : ''); |