no_comment

9 files changed, 18 insertions, 8 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index e0eaf3fdc..ebad67be4 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -136,7 +136,7 @@ endif
 	tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia
 
 full_stage2:
-	rm -rf $(DEST)
+	$(SUDO) rm -rf $(DEST)
 	mkdir -p $(DEST)
 	$(MAKE) get_needed_files 
 	$(MAKE) stage2
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 14f0c8c68..c8d94f082 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -103,6 +103,10 @@ sub readMonitorsDB {
 	@l == @fields or log::l("bad line $lineno ($_)"), next;
 
 	my %l; @l{@fields} = @l;
+	if ($monitors{$l{type}}) {
+	    my $i; for ($i = 0; $monitors{"$l{type} ($i)"}; $i++) {}
+	    $l{type} = "$l{type} ($i)";
+	}
 	$monitors{$l{type}} = \%l;
     }
     while (my ($k, $v) = each %standard_monitors) {
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 11fee769d..2ddd2fb9a 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -608,10 +608,10 @@ $keyboardsection_part3 = '
     XkbKeycodes     "xfree86"
     XkbTypes        "default"
     XkbCompat       "default"
-    XkbSymbols      "us(pc101)"
+    XkbSymbols      "us(pc105)"
     XkbGeometry     "pc"
     XkbRules        "xfree86"
-    XkbModel        "pc101"
+    XkbModel        "pc105"
 ';
 }
 
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 2f22a3977..a8653a9ff 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -128,7 +128,7 @@ sub getDAC960() {
     #- We are looking for lines of this format:DAC960#0:
     #- /dev/rd/c0d0: RAID-7, Online, 17928192 blocks, Write Thru0123456790123456789012
     foreach (syslog()) {
-	my ($device, $info) = m|/dev/rd/(.*?): (.*?),| or next;
+	my ($device, $info) = m|/dev/(rd/.*?): (.*?),| or next;
 	push @idi, { info => $info, type => 'hd', device => $device };
 	log::l("DAC960: $device ($info)");
     }
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index f4bbc0285..6c3a6a6e4 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -68,7 +68,7 @@ sub make($) {
 	$major = 1;
 	$minor = $1 eq '' ? 1 : $1;
     } elsif (m|^rd/c(\d+)d(\d+)(p(\d+))?|) {
-	# dac 960 "/rd/cXdXXpX"
+	# dac 960 "rd/cXdXXpX"
         $type = c::S_IFBLK();
 	$major = 48 + $1;
 	$minor = 8 * $2 + $4;
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 4ad02d116..86101f814 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -257,7 +257,7 @@ sub selectLanguage {
 sub doPartitionDisks($$) {
     my ($o, $hds, $raid) = @_;
 
-    if (!$::isStandalone && fsedit::is_one_big_fat($hds)) {
+    if ($::beginner && fsedit::is_one_big_fat($hds)) {
 	#- wizard
 	my $min_linux = 600 << 11;
 	my $max_linux = 1500 << 11;
@@ -266,6 +266,7 @@ sub doPartitionDisks($$) {
 	my ($part) = fsedit::get_fstab(@{$o->{hds}});
 	my $w = $o->wait_message(_("Resizing"), _("Computing fat filesystem bounds"));
 	my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) };
+	$@ and goto diskdrake;
 	my $min_win = $resize_fat->min_size;
 	if (!$@ && $part->{size} > $min_linux + $min_freewin + $min_win && $o->ask_okcancel('',
 _("WARNING!
@@ -299,6 +300,7 @@ When sure, press Ok."))) {
 	}
     }
 
+  diskdrake:
     while (1) {
 	diskdrake::main($hds, $raid, interactive_gtk->new, $o->{partitions});
 	if (!grep { isSwap($_) } fsedit::get_fstab(@{$o->{hds}})) {
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 988045458..99a7733ac 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -128,10 +128,12 @@ sub gtkadd($@) {
 
 sub gtktext_insert($$) {
     my ($w, $t) = @_;
+    $w->freeze;
     $w->backward_delete($w->get_length);
     $w->insert(undef, undef, undef, "$t\n"); #- needs \n otherwise in case of one line text the beginning is not shown (even with the vadj->set_value)
     $w->set_word_wrap(1);
     $w->vadj->set_value(0);
+    $w->thaw;
     $w;
 }
 
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index f7e1d55ad..19e425872 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -436,8 +436,7 @@ sub write($) {
 	$_->{normal}{local_start} = $_->{normal}{start} - $_->{start};
 	$_->{extended} and $_->{extended}{local_start} = $_->{extended}{start} - $hd->{primary}{extended}{start};
 
-	print "Trying to write an extended partition table, bad !!!\n";
-	#$hd->write($_->{start}, $_->{raw}) or die "writing of partition table failed";
+	arch() !~ /^sparc/ and $hd->write($_->{start}, $_->{raw}) or die "writing of partition table failed";
     }
     $hd->{isDirty} = 0;
 
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 728de2f4d..449c8b428 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -50,6 +50,7 @@ my %l2t = (
 'French (Belgium)' => 'Europe/Brussels',
 'French (Canada)' => 'Canada/Atlantic', # or Newfoundland ? or Eastern ?
 'Gaeilge (Ireland)' => 'Europe/Dublin',
+'German (Austria)' => 'Europe/Vienna',
 'German (Germany)' => 'Europe/Berlin',
 'Greek (Greece)' => 'Europe/Athens',
 'Hungarian (Hungary)' => 'Europe/Budapest',
@@ -72,6 +73,8 @@ my %l2t = (
 'Russian (Russia)' => 'Europe/Moscow',
 'Serbian (Serbia)' => 'Europe/Belgrade',
 'Slovak (Slovakia)' => 'Europe/Bratislava',
+'Spanish (Argentina)' => 'America/Buenos_Aires',
+'Spanish (Mexico)' => 'America/Mexico_City',
 'Spanish (Spain)' => 'Europe/Madrid',
 'Swedish (Finland)' => 'Europe/Helsinki',
 'Swedish (Sweden)' => 'Europe/Stockholm',