summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install_steps_auto_install.pm7
-rw-r--r--perl-install/install_steps_gtk.pm10
-rw-r--r--perl-install/modules.pm21
-rw-r--r--perl-install/my_gtk.pm1
-rw-r--r--perl-install/network.pm4
-rw-r--r--perl-install/partition_table_raw.pm1
-rw-r--r--perl-install/pkgs.pm2
-rwxr-xr-xperl-install/standalone/adduserdrake2
9 files changed, 31 insertions, 20 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index c5b570620..5b99a022c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -312,6 +312,7 @@ wait %d seconds for default boot.
kernel_or_dev => "/dev/$_->{device}",
label => isDos($_) ? "dos" . ($dos++ ? $dos : '') : "windows" . ($win++ ? $win : '') ,
table => "/dev/$_->{rootDevice}",
+ unsafe => 1
}) if isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) });
}
}
@@ -550,6 +551,8 @@ sub install_grub {
print F "color black/cyan yellow/cyan";
print F "i18n ", $file2grub->("/boot/grub/messages");
print F "keytable ", $file2grub->($lilo->{keytable}) if $lilo->{keytable};
+ print F "altconfigfile ", $file2grub->(my $once = "/boot/grub/menu.once");
+ output "$prefix$once", " " x 100;
map_index {
print F "default $::i" if $_->{label} eq $lilo->{default};
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 4b585f7e6..0ff5743b5 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -14,7 +14,7 @@ use modules;
#-######################################################################################
#- misc imports
#-######################################################################################
-use common qw(:common);
+use common qw(:common :functional);
use install_steps;
use log;
@@ -70,6 +70,11 @@ sub selectLanguage {
lang::load_console_font($o->{lang});
}
+sub installPackages {
+ my ($o, $packages) = @_;
+ catch_cdie { $o->install_steps::installPackages($packages) } sub { print "$@\n"; 1 }
+}
+
sub exitInstall {
my ($o, $alldone) = @_;
return if $o->{autoExitInstall};
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index a94c55711..26ed409fb 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -428,15 +428,15 @@ sub choosePackagesTree {
}
$select->($p);
}
- my @l = $children->($parent);
- my $nb = grep { pkgs::packageFlagSelected($_) } @l;
- my $pix = $nb==0 ? $pix_unselect : $nb<@l ? $pix_semisele : $pix_selected;
- $tree->node_set_pixmap($parent, 1, $pix->[0], $pix->[1]);
+ if (my @l = $children->($parent)) {
+ my $nb = grep { pkgs::packageFlagSelected($_) } @l;
+ my $pix = $nb==0 ? $pix_unselect : $nb<@l ? $pix_semisele : $pix_selected;
+ $tree->node_set_pixmap($parent, 1, $pix->[0], $pix->[1]);
+ }
}
};
my $toggle = sub { &$toggle_; gtkset_mousecursor_normal() };
- $tree->signal_connect(button_press_event => sub { $toggle->(0) if $_[1]{type} =~ /^2/ });
$tree->signal_connect(key_press_event => sub {
my ($w, $e) = @_;
my $c = chr($e->{keyval} & 0xff);
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 16058a0b1..6a2a5f2d0 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -133,17 +133,12 @@ arch() =~ /^sparc/ ? (
"sim710" => "sim710",
"sym53c416" => "sym53c416",
"tmscsim" => "tmscsim",
- "scsi_mod" => "scsi_mod",
),
"aic7xxx" => "Adaptec 2740, 2840, 2940",
"ncr53c8xx" => "NCR 53C8xx PCI",
# "pci2000" => "Perceptive Solutions PCI-2000", # TODO
"qlogicisp" => "Qlogic ISP",
"sym53c8xx" => "Symbios 53c8xx",
- "sd_mod" => "sd_mod",
- "ide-mod" => "ide-mod",
- "ide-probe" => "ide-probe",
-#- "ide-probe-mod" => "ide-probe-mod",
}],
[ 'disk', {
arch() =~ /^sparc/ ? (
@@ -162,7 +157,6 @@ arch() =~ /^sparc/ ? (
"ppa" => "Iomega PPA3 (parallel port Zip)",
"imm" => "Iomega Zip (new driver)",
),
- "ide-disk" => "IDE disk",
}],
[ 'cdrom', {
arch() !~ /^sparc|alpha/ ? (
@@ -178,10 +172,6 @@ arch() !~ /^sparc|alpha/ ? (
"cdu31a" => "Sony CDU-31A",
"sonycd535" => "Sony CDU-5xx",
) : (),
- "isofs" => "iso9660",
- "ide-cd" => "ide-cd",
- "sr_mod" => "SCSI CDROM support",
- "cdrom" => "cdrom",
}],
[ 'sound', {
arch() !~ /^sparc/ ? (
@@ -300,6 +290,17 @@ arch() !~ /^sparc/ ? (
"ide-floppy" => "ide-floppy",
"ide-tape" => "ide-tape",
"nbd" => "nbd",
+
+ "scsi_mod" => "scsi_mod",
+ "sd_mod" => "sd_mod",
+ "ide-mod" => "ide-mod",
+ "ide-probe" => "ide-probe",
+ "ide-disk" => "IDE disk",
+ "isofs" => "iso9660",
+ "ide-cd" => "ide-cd",
+ "sr_mod" => "SCSI CDROM support",
+ "cdrom" => "cdrom",
+#- "ide-probe-mod" => "ide-probe-mod",
}],
);
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index a31943072..224289a34 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -186,6 +186,7 @@ sub gtkset_default_fontset {
sub gtkctree_children {
my ($node) = @_;
my @l;
+ $node or return;
for (my $p = $node->row->children; $p; $p = $p->row->sibling) {
push @l, $p;
}
diff --git a/perl-install/network.pm b/perl-install/network.pm
index d099ec309..2ef488148 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -222,14 +222,14 @@ sub dns {
my ($ip) = @_;
my $mask = masked_ip($ip);
my @masked = masked_ip($ip) =~ $ip_regexp;
- $masked[3] = 1;
+ $masked[3] = 2;
join (".", @masked);
}
sub gateway {
my ($ip) = @_;
my @masked = masked_ip($ip) =~ $ip_regexp;
- $masked[3] = 254;
+ $masked[3] = 1;
join (".", @masked);
}
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index 7eee56f5a..32910648b 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -10,6 +10,7 @@ use c;
my @MBR_signatures = (
[ 'empty', 0, "\0\0\0\0" ],
[ 'grub', 0, "\xEBG", 0x17d, "stage1 \0" ],
+ [ 'grub', 0, "\xEBH", 0x17e, "stage1 \0" ],
[ 'grub', 0, "\xEBH", 0x18a, "stage1 \0" ],
[ 'lilo', 0x2, "LILO" ],
[ 'lilo', 0x6, "LILO" ],
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 956498cd5..e03f25cce 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1176,7 +1176,7 @@ sub install($$$;$$) {
log::l("bad package $_->{file}");
packageSetFlagSelected($_, 0);
}
- cdie ("error installing package list: " . join("\n", map { $_->{file} } @badpkgs));
+ cdie ("error installing package list: " . join(", ", map { $_->{file} } @badpkgs));
}
} while ($nb > 0 && !$pkgs::cancel_install);
diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index b3750690f..1ce283f8c 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-use lib ".";# qw(/usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
use common qw(:common :functional :system :file);
use interactive;
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-06 18:26:04 +0000