summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/detect_devices.pm10
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/my_gtk.pm2
-rw-r--r--perl-install/share/compssList2
-rw-r--r--perl-install/share/install.rc1
5 files changed, 12 insertions, 6 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8bee5e612..f03bbd596 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -219,9 +219,13 @@ sub hasModem($) {
}
sub hasMousePS2() {
- my $f = detect_devices::tryOpen("psaux");
- my $t; sysread($f, $t, 256) or return;
- $t eq "\xFE";
+ my $t; sysread(tryOpen("psaux"), $t, 1) != 1 || $t ne "\xFE";
+}
+
+sub hasMouseUSB(;$) {
+ my @modules = map { "usb-$_" } qw(uhci ohci ohci-hcd);
+ my ($first) = @_;
+# modprobe(
}
#-######################################################################################
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 09a17c9e5..752b8b8c1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -588,7 +588,7 @@ sub setRootPassword($) {
return if $o->{security} < 1 && !$clicked;
- $o->ask_from_entries_ref([_("Set root password"), _("Ok"), _("No password")],
+ $o->ask_from_entries_ref([_("Set root password"), _("Ok"), $o->{security} > 3 ? () : _("No password")],
_("Set root password"),
[_("Password:"), _("Password (again):"), $o->{installClass} eq "server" || $::expert ? (_("Use shadow file"), _("Use MD5 passwords")) : (), $::beginner ? () : _("Use NIS") ],
[{ val => \$sup->{password}, hidden => 1 },
@@ -623,6 +623,7 @@ sub addUser($) {
my ($o, $clicked) = @_;
my $u = $o->{user} ||= $o->{security} < 1 ? { name => "mandrake", realname => "default" } : {};
$u->{password2} ||= $u->{password} ||= "";
+ $u->{shell} ||= "/bin/bash";
my @fields = qw(realname name password password2);
my @shells = install_any::shells($o);
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 733cad611..848a764a4 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -197,7 +197,7 @@ sub create_okcancel($;$$) {
gtkadd(create_hbox(),
gtksignal_connect($w->{ok} = new Gtk::Button($ok || _("Ok")), "clicked" => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk->main_quit }),
- gtksignal_connect(new Gtk::Button($cancel || _("Cancel")), "clicked" => $w->{cancel_clicked} || sub { $w->{retval} = 0; Gtk->main_quit }),
+ ($ok xor $cancel) ? () : gtksignal_connect(new Gtk::Button($cancel || _("Cancel")), "clicked" => $w->{cancel_clicked} || sub { $w->{retval} = 0; Gtk->main_quit }),
);
}
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index bdb2d2f56..9ab0df1f0 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -263,7 +263,7 @@ kcmlaptop 82 0 60
kcpumon 82 0 60
kdbg 30 0 27
kdeadmin 82 0 60
-kdebase 0 0 0
+kdebase 89 0 68
kdegames 80 0 59
kdegraphics 88 0 66
kdelibs 0 0 0
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index 5e8a9d7d0..882f093ab 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -49,3 +49,4 @@ style "logo"
widget "*" style "default-font"
widget "*Steps*" style "steps"
widget "*logo*" style "logo"
+