summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmake_boot_img13
-rw-r--r--perl-install/install2.pm2
2 files changed, 6 insertions, 9 deletions
diff --git a/make_boot_img b/make_boot_img
index 55a25f6f9..1b0ed51b3 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -10,7 +10,6 @@ my $corporate = $ENV{CORPORATE} && " corporate"; #- use this for building a corp
($img, $type) = @ARGV;
$instdir = "install";
-$ks = "kickstart=floppy" if $type =~ s/_ks//;
$mnt = "/tmp/drakx_mnt";
$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1";
@@ -89,7 +88,7 @@ sub boot_img_i386 {
_ "cat vmlinuz > $mnt/vmlinuz";
-f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz");
- my $timeout = $ks ? 1 : 72;
+ my $timeout = 72;
output("$mnt/syslinux.cfg", "
default linux
prompt 1
@@ -99,19 +98,19 @@ F1 help.msg
F2 boot.msg
label linux
kernel vmlinuz
- append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=788
+ append ramdisk_size=32000 initrd=$type.rdz $type vga=788
label vgalo
kernel vmlinuz
- append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=785
+ append ramdisk_size=32000 initrd=$type.rdz $type vga=785
label vgahi
kernel vmlinuz
- append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=791
+ append ramdisk_size=32000 initrd=$type.rdz $type vga=791
label vga16
kernel vmlinuz
- append $ks ramdisk_size=32000 initrd=$type.rdz $type vga16
+ append ramdisk_size=32000 initrd=$type.rdz $type vga16
label text
kernel vmlinuz
- append $ks ramdisk_size=32000 initrd=$type.rdz $type text
+ append ramdisk_size=32000 initrd=$type.rdz $type text
label patch
kernel vmlinuz
append ramdisk_size=32000 initrd=$type.rdz $type patch vga=788
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 17e20c5fc..5fbeace0f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -581,7 +581,6 @@ sub main {
text => sub { $o->{interactive} = "newt" },
stdio => sub { $o->{interactive} = "stdio"},
corporate => sub { $::corporate = 1 },
- ks => sub { $::auto_install ||= 1 },
kickstart => sub { $::auto_install = $v },
auto_install => sub { $::auto_install = $v },
simple_themes => sub { $o->{simple_themes} = 1 },
@@ -634,7 +633,6 @@ sub main {
if ($::auto_install) {
require install_steps_auto_install;
if ($::auto_install eq 'floppy') {
- eval { $o = $::o = install_any::loadO($o, "auto_inst.cfg.pl") };
eval { $o = $::o = install_any::loadO($o, "floppy") } if $@;
} else {
eval { $o = $::o = install_any::loadO($o, $::auto_install) };