From f95bbe0c4e87db1f21636ded4c340c5ef4c690a0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 5 Aug 2004 08:16:24 +0000
Subject: write auto_inst.cfg after making room on the floppy image

---
 perl-install/install_any.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 95c73953c..4c4dd0334 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -888,12 +888,6 @@ sub getAndSaveAutoInstallFloppies {
 	    my $dev = devices::set_loop($img) or log::l("couldn't set loopback device"), return;
 	    find { eval { fs::mount($dev, $mountdir, $_, 0); 1 } } qw(ext2 vfat) or return;
 
-	    if (@imgs == 1 || $img =~ /drivers/) {
-		local $o->{partitioning}{clearall} = !$replay;
-		eval { output("$mountdir/auto_inst.cfg", g_auto_install($replay)) };
-		$@ and log::l("Warning: <", formatError($@), ">");
-	    }
-
 	    if (-e "$mountdir/menu.lst") {
 		# hd_grub boot disk is different than others
 		substInFile {
@@ -915,6 +909,12 @@ sub getAndSaveAutoInstallFloppies {
    including any Windows partitions !!
 " . "07\n";
 	    }
+
+	    if (@imgs == 1 || $img =~ /drivers/) {
+		local $o->{partitioning}{clearall} = !$replay;
+		eval { output("$mountdir/auto_inst.cfg", g_auto_install($replay)) };
+		$@ and log::l("Warning: <", formatError($@), ">");
+	    }
 	
 	    fs::umount($mountdir);
 	    devices::del_loop($dev);
-- 
cgit v1.2.1