no_comment

9 files changed, 23 insertions, 27 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 6d301c3fb..87b4a3a01 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -330,7 +330,7 @@ sub formatPartitions {
 
     my $d = "/initrd/loopfs/lnx4win";
     if (-d $d) {
-	install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(loadlin.exe linux.pif lnx4win.exe);
+	install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(loadlin.exe linux.pif lnx4win.exe lnx4win.ico);
     }
 
     #-noatime option for ext2 fs on laptops (do not wake up the hd)
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 507d0b0f1..9fca69858 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -539,7 +539,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(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security modem useSupermount); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk users installClass partitioning isUpgrade manualFstab nomouseprobe crypto security modem useSupermount autoExitInstall); #- TODO modules bootloader 
 
     if (my $card = $::o->{X}{card}) {
 	$o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 19affa768..5cf74d227 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -127,7 +127,7 @@ sub doPartitionDisks {
 	        grep { isFat($_) } fsedit::get_fstab(@{$o->{hds}}) or die "wow, lnx4win with no fat partitions! hard times :(";
 	my $real_part = @l > 1 && $o->doPartitionDisksLnx4winDev(\@l) || $l[0];
 
-	my $handle = loopback::inspect($real_part) or die _("This partition can't be used for loopback");
+	my $handle = loopback::inspect($real_part, '', 'rw') or die _("This partition can't be used for loopback");
 	my $size = loopback::getFree($handle->{dir}, $real_part); 
 
 	my $max_linux = 1000 << 11; $max_linux *= 10 if $::expert;
@@ -138,7 +138,9 @@ sub doPartitionDisks {
 	$root->{size} = min($size - $swap->{size} - $min_freewin, $max_linux);
 
 	$o->doPartitionDisksLnx4winSize(\$root->{size}, \$swap->{size}, $size - 2 * $swap->{size}, 2 * $swap->{size});
-	    
+
+	unlink "$handle->{dir}$_" foreach "/lnx4win/swapfile", "/lnx4win/linuxsys.img";
+
 	push @{$real_part->{loopback}}, $root, $swap;	
     } else {
 	partition_table::write($_) foreach @$hds;
@@ -301,6 +303,9 @@ Consoles 1,3,4,7 may also contain interesting information";
     #- call update-menus at the end of package installation
     run_program::rooted($o->{prefix}, "update-menus");
 
+    #- mainly for auto_install's
+    run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};
+
     #- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm.
     my $f = "$o->{prefix}/etc/sysconfig/desktop";
     if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 8367af3b6..3f7d6fc0a 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -32,6 +32,9 @@ sub errorInStep {
 }
 
 sub exitInstall {
+    my ($o) = @_;
+    return if $o->{autoExitInstall};
+
     print "Auto installation complete\n";
     print "Press <Enter> to reboot\n";
     <STDIN>;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 72f9a3fef..e007303f1 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -783,7 +783,7 @@ sub init_sizes() {
 }
 
 #------------------------------------------------------------------------------
-sub createXconf($$$) {
+sub createXconf {
     my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_;
 
     devices::make("/dev/kdb") if arch() =~ /^sparc/; #- used by Xsun style server.
diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm
index 17e8c40a6..da89f1e5e 100644
--- a/perl-install/loopback.pm
+++ b/perl-install/loopback.pm
@@ -64,7 +64,6 @@ sub create {
     eval { commands::mkdir_("-p", dirname($f)) };
 
     log::l("creating loopback file $f ($part->{size} sectors)");
-    unlink $f;
 
     local *F;
     sysopen F, $f, 2 | c::O_CREAT() or die "failed to create loopback file";
diff --git a/perl-install/share/themes-mdk.rc b/perl-install/share/themes-mdk.rc
index 47be00f67..3f45770bb 100644
--- a/perl-install/share/themes-mdk.rc
+++ b/perl-install/share/themes-mdk.rc
@@ -62,20 +62,9 @@ style "button"
         function        = BOX
 	recolorable     = TRUE
 	state           = NORMAL
-	detail          = "buttondefault"
-	shadow          = IN
-	file            = "blueHeart-button_def.png"
-	border          = { 9, 9, 9, 9 }
-	stretch         = TRUE
-      }
-    image 
-      {
-        function        = BOX
-	recolorable     = TRUE
-	state           = NORMAL
 	shadow          = OUT
-	file            = "blueHeart-button1.png"
-	border          = { 3, 3, 3, 3 }
+	file            = "mdk-button1.png"
+	border          = { 7, 7, 7, 7 }
 	stretch         = TRUE
       }
     image 
@@ -84,8 +73,8 @@ style "button"
 	recolorable     = TRUE
 	state           = PRELIGHT
 	shadow          = OUT
-	file            = "blueHeart-button2.png"
-	border          = { 3, 3, 3, 3 }
+	file            = "mdk-button1.png"
+	border          = { 7, 7, 7, 7 }
 	stretch         = TRUE
       }
     image 
@@ -94,8 +83,8 @@ style "button"
 	recolorable     = TRUE
 	state           = NORMAL
 	shadow          = IN
-	file            = "blueHeart-button4.png"
-	border          = { 2, 2, 2, 2 }
+	file            = "mdk-button4.png"
+	border          = { 7, 7, 7, 7 }
 	stretch         = TRUE
       }
     image 
@@ -104,8 +93,8 @@ style "button"
 	recolorable     = TRUE
 	state           = SELECTED
 	shadow          = IN
-	file            = "blueHeart-button4.png"
-	border          = { 3, 3, 3, 3 }
+	file            = "mdk-button4.png"
+	border          = { 7, 7, 7, 7 }
 	stretch         = TRUE
       }
     image 
@@ -114,8 +103,8 @@ style "button"
 	recolorable     = TRUE
 	state           = ACTIVE
 	shadow          = IN
-	file            = "blueHeart-button4.png"
-	border          = { 3, 3, 3, 3 }
+	file            = "mdk-button4.png"
+	border          = { 7, 7, 7, 7 }
 	stretch         = TRUE
       }
    }
diff --git a/perl-install/share/themes/mdk-button1.png b/perl-install/share/themes/mdk-button1.png
index 5d65731bd..9d5f701c6 100644
--- a/perl-install/share/themes/mdk-button1.png
+++ b/perl-install/share/themes/mdk-button1.png
diff --git a/perl-install/share/themes/mdk-button4.png b/perl-install/share/themes/mdk-button4.png
index 35b9fa364..c93837c08 100644
--- a/perl-install/share/themes/mdk-button4.png
+++ b/perl-install/share/themes/mdk-button4.png