- 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)

2 files changed, 3 insertions, 2 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" : '');
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index dba934265..2c0486dab 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -254,7 +254,7 @@ foreach my $i (0..99) {
 my $server = $intf[0]{IPADDR} || $net->{network}{HOSTNAME};
 push @{$pxelinux_cfg->{entry}}, { label => $label, 
 				  kernel => "images/alt0/vmlinuz",
-				  append => "initrd=images/alt0/all.rdz ramdisk=32000 vga=788 ".($auto_inst_cfg ? "kickstart=$auto_inst_cfg " : "")."automatic=method:http,network:dhcp,interface:eth0,dns:$net->{resolv}{dnsServer},server:$server,directory:$dir root=/dev/ram3" };
+				  append => "initrd=images/alt0/all.rdz vga=788 " . ($auto_inst_cfg ? "kickstart=$auto_inst_cfg " : "") . "automatic=met:http,netw:dhcp,int:eth0,dns:$net->{resolv}{dnsServer},ser:$server,dir:$dir" };
 build_pxelinux_cfg($pxelinux_cfg, "/var/lib/tftpboot/PXEClient/pxelinux.cfg/default");
 
 #- make directory available for httpd.