remove mkbootdisk support

5 files changed, 2 insertions, 72 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index f7c77d75a..07afd58c8 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -83,60 +83,6 @@ sub kernelVersion() {
     first($kernel =~ /vmlinuz-(.*)/);
 }
 
-sub mkbootdisk {
-    my ($in, $bootloader, $fstab) = @_;
-
-    if (arch() =~ /sparc/) {
-	#- as probing floppies is a bit more different on sparc, assume always /dev/fd0.
-	#- [pixel] uh, but in that case it would be better to change detect_devices::floppies, no?
-	$in->ask_okcancel('',
-			 N("A custom bootdisk provides a way of booting into your Linux system without
-depending on the normal bootloader. This is useful if you don't want to install
-SILO on your system, or another operating system removes SILO, or SILO doesn't
-work with your hardware configuration. A custom bootdisk can also be used with
-the Mandrake rescue image, making it much easier to recover from severe system
-failures.
-
-If you want to create a bootdisk for your system, insert a floppy in the first
-drive and press \"Ok\".")) or return;
-    } else {
-	$in->ask_yesorno('', formatAlaTeX(
-			    N("A custom bootdisk provides a way of booting into your Linux system without
-depending on the normal bootloader. This is useful if you don't want to install
-LILO (or grub) on your system, or another operating system removes LILO, or LILO doesn't
-work with your hardware configuration. A custom bootdisk can also be used with
-the Mandrake rescue image, making it much easier to recover from severe system
-failures. Would you like to create a bootdisk for your system?
-%s", isThisFs('xfs', fsedit::get_root($fstab)) ? N("
-
-(WARNING! You're using XFS for your root partition,
-creating a bootdisk on a 1.44 Mb floppy will probably fail,
-because XFS needs a very large driver).") : ''))) or return;
-    }
-
-    my $floppy_dev;
-    my @l = detect_devices::floppies_dev() or die \N("Sorry, no floppy drive available");
-    my %l = (
-	     'fd0'  => N("First floppy drive"),
-	     'fd1'  => N("Second floppy drive"),
-	     'Skip' => N("Skip"),
-	    );
-    my $format = sub { $l{$_[0]} || $_[0] };
-
-    $in->ask_from_({
-	       messages => N("Choose the floppy drive you want to use to make the bootdisk"),
-	      }, [ { val => \$floppy_dev, list => \@l, format => $format } ]
-        ) or return;
-
-    $in->ask_warn('', N("Insert a floppy in %s", $format->($floppy_dev)));
-
-    my $_w = $in->wait_message('', N("Creating bootdisk..."));
-
-    require bootloader;
-    bootloader::mkbootdisk(kernelVersion(), $floppy_dev, $bootloader->{perImageAppend});
-    1;
-}
-
 sub setupBootloader {
     my ($in, $b, $all_hds, $fstab, $security) = @_;
     my $hds = $all_hds->{hds};
@@ -252,7 +198,6 @@ sub setupBootloader__general {
     my $memsize = bootloader::get_append($b, 'mem');
     my $prev_clean_tmp = my $clean_tmp = any { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []};
     my $prev_boot = $b->{boot};
-    my $mkbootdisk;
 
     $b->{password2} ||= $b->{password} ||= '';
     $b->{vga} ||= 'normal';
@@ -276,9 +221,6 @@ sub setupBootloader__general {
             { label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
             { label => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", text => N("restrict") },
 		),
-                if_(arch() !~ /alpha/ && arch() !~ /ppc/,
-            { label => N("Create a bootdisk"), val => \$mkbootdisk, type => 'bool', advanced => 1 },
-		),
             { label => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
             { label => N("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1 },
 		if_(detect_devices::isLaptop(),
@@ -331,8 +273,6 @@ sub setupBootloader__general {
 	    @{$all_hds->{special}} = grep { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special}};
 	}
     }
-    mkbootdisk($in, $b, $fstab) or return &setupBootloader__general if $mkbootdisk;
-
     1;
 }
 
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c6d3b935e..6e86c0bef 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -68,14 +68,6 @@ sub mkinitrd {
     -e "$::prefix/$initrdImage";
 }
 
-sub mkbootdisk {
-    my ($kernelVersion, $dev, $append) = @_;
-
-    modules::load(if_(arch() =~ /sparc/, 'romfs'), 'loop', 'vfat');
-    my @l = if_($append, '--appendargs', $append);
-    run_program::rooted_or_die($::prefix, 'mkbootdisk', '--noprompt', @l, '--device', "/dev/$dev", $kernelVersion);
-}
-
 sub read() {
     my $file = sprintf("/etc/%s.conf", arch() =~ /sparc/ ? 'silo' : arch() =~ /ppc/ ? 'yaboot' : 'lilo');
     my $bootloader = $file =~ /lilo/ && detect_bootloader() =~ /GRUB/ ? read_grub() : read_lilo($file);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9a5c98b26..3226fa86a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -35,7 +35,6 @@ use fs;
 #-#######################################################################################
 $o = $::o = {
 #    bootloader => { linear => 0, message => 1, timeout => 5, restricted => 0 },
-    mkbootdisk => 0, #- no mkbootdisk if 0 or undef, find a floppy with 1, or fd1
 #-    packages   => [ qw() ],
     partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 },
     authentication => { md5 => 1, shadow => 1 },
@@ -414,7 +413,6 @@ sub main {
 	(my $root = `/bin/pwd`) =~ s|(/[^/]*){5}$||;
 	symlinkf $root, "/tmp/image" or die "unable to create link /tmp/image";
 	$o->{method} ||= "cdrom";
-	$o->{mkbootdisk} = 0;
     }
     if (!$::testing && !$::live) {
 	symlink "rhimage", "/tmp/image"; #- for compatibility with old stage1
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 607659ef8..be4b7d406 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -660,7 +660,7 @@ sub g_auto_install {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe netcnx useSupermount autoExitInstall mkbootdisk X services); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe netcnx useSupermount autoExitInstall X services); #- TODO modules bootloader 
 
     if ($::o->{printer}) {
 	$o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER DEFAULT BROWSEPOLLADDR BROWSEPOLLPORT MANUALCUPSCONFIG);
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 3304c3dc2..4f12be3bb 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -92,7 +92,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) {
     ugtk2->import(qw(:helpers :wrappers :create));
 
     my %tree;
-    $struct_gui{$_} = 'General' foreach qw(lang isUpgrade autoExitInstall timezone default_packages mkbootdisk);
+    $struct_gui{$_} = 'General' foreach qw(lang isUpgrade autoExitInstall timezone default_packages);
     $struct_gui{$_} = 'Security' foreach qw(crypto security);
     $struct_gui{$_} = 'Harddrive' foreach qw(partitions manualFstab useSupermount partitioning);
     $struct_gui{$_} = 'Network' foreach qw(intf netc netcnx);