diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/commands.pm | 1 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/help.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 6 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 1 | ||||
| -rw-r--r-- | perl-install/share/diskdrake.rc | 6 |
10 files changed, 22 insertions, 10 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 3e3efd6d8..3a36bcb82 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -24,7 +24,7 @@ $(DIRS): $(MAKE) -C $@ test_pms: verify_c - ./perl2fcalls -excludec -excluderesize_fat::c_rewritten install2 standalone/keyboarddrake standalone/XFdrake standalone/drakboot + for i in install2 standalone/keyboarddrake standalone/XFdrake standalone/drakboot; do ./perl2fcalls -excludec -excluderesize_fat::c_rewritten $$i; done for i in install2 install_steps_*.pm; do perl -cw -I. $$i; done verify_c: diff --git a/perl-install/commands.pm b/perl-install/commands.pm index 1cfe5dfea..5bc346694 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -578,6 +578,7 @@ sub bug { header("scsi"), cat_("/proc/scsi/scsi"), header("lsmod"), cat_("/proc/modules"), header("cmdline"), cat_("/proc/cmdline"), + header("partitions"), cat_("/proc/partitions"), header("cpuinfo"), cat_("/proc/cpuinfo"), header("syslog"), cat_("/tmp/syslog"), header("ddebug.log"), cat_("/tmp/ddebug.log"), diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 2946f5c31..41a603a50 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -241,7 +241,7 @@ sub hasUltra66 { my $ide = sprintf "ide2=0x%x,0x%x ide3=0x%x,0x%x", @l == 2 ? (map_index { hex($_) + (odd($::i) ? 1 : -1) } map { (split ' ')[3..4] } @l) : - (map_index { hex($_) - 1 } map { (split ' ')[3..6] } @l); + (map_index { hex($_) + (odd($::i) ? 1 : -1) } map { (split ' ')[3..6] } @l); log::l("HPT|Ultra66: found $ide"); $ide; diff --git a/perl-install/help.pm b/perl-install/help.pm index 9662b6150..9370fc9a0 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -13,7 +13,7 @@ selectInstallClass => [ __("Choose \"Install\" if there are no previous versions of GNU/Linux installed, or if you wish to use multiple distributions or versions. -Choose \"Upgrade\" if you wish to update a previous version of Mandrake Linux: +Choose \"Rescue\" if you wish to rescue a previous version of Mandrake Linux: %s or %s. diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 9ccb77ab2..85c6203f3 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -363,7 +363,7 @@ sub miscellaneous { $usb{ZIP} = bool2yesno(-d "/proc/scsi/usb"); setVarsInSh($f, \%usb); - install_any::fsck_option(); + install_any::fsck_option($o); } 'installPackages'; } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 789dea2d4..48fc1a935 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -225,7 +225,7 @@ sub spawnShell { exec {"/bin/sh"} "-/bin/sh" or log::l("exec of /bin/sh failed: $!"); } -sub fsck_option() { +sub fsck_option { my ($o) = @_; my $y = $o->{security} < 3 && $::beginner ? "-y " : ""; substInFile { s/^(\s*fsckoptions="?)(-y )?/$1$y/ } "$o->{prefix}/etc/rc.d/rc.sysinit"; @@ -628,7 +628,7 @@ sub suggest_mount_points { my $d = $handle->{dir}; my ($mnt) = grep { -e "$d/$l{$_}" } keys %l; $mnt ||= (stat("$d/.bashrc"))[4] ? '/root' : '/home/user' . ++$user if -e "$d/.bashrc"; - $mnt ||= (grep { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_("$d")) && '/home'; + $mnt ||= (grep { -d $_ && (stat($_))[4] >= 500 && -e "$_/.bashrc" } glob_("$d")) ? '/home' : ''; next if $uniq && fsedit::mntpoint2part($mnt, \@parts); $part->{mntpoint} = $mnt; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f95573386..ffba727c8 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -489,8 +489,10 @@ sub selectMouse($) { } #------------------------------------------------------------------------------ -#- configureNetwork moved to network and is renamed. -#------------------------------------------------------------------------------ +sub configureNetwork { + my ($o) = @_; + network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf}); +} #------------------------------------------------------------------------------ sub installCrypto { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ee35a5282..c7657b187 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -129,7 +129,7 @@ are you ready to answer that kind of questions?"), $o->{isUpgrade} = $o->selectInstallClass1($verifInstallClass, first(list2kv(@c)), ${{reverse %c}}{$::beginner ? "beginner" : $::expert ? "expert" : "specific"}, - [ __("Install"), __("Upgrade") ], $o->{isUpgrade} ? "Upgrade" : "Install") eq "Upgrade"; + [ __("Install"), __("Rescue") ], $o->{isUpgrade} ? "Rescue" : "Install") eq "Rescue"; if ($::corporate || $::beginner) { delete $o->{installClass}; @@ -194,10 +194,14 @@ sub ask_mntpoint_s { @fstab = @$fstab if @fstab == 0; die _("no available partitions") if @fstab == 0; + if (@fstab == 1) { $fstab[0]{mntpoint} = '/'; } else { install_any::suggest_mount_points($o->{hds}, $o->{prefix}, 'uniq'); + + log::l("default mntpoint $_->{mntpoint}") foreach @fstab; + $o->ask_from_entries_refH('', _("Choose the mount points"), [ map { partition_table_raw::description($_) => diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index defcb412a..a31943072 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -40,7 +40,6 @@ sub new { push @interactive::objects, $o unless $opts{no_interactive_objects}; $o->{rwindow}->set_modal(1) if $my_gtk::grab || $o->{grab}; - print "modal############################################################\n" if $my_gtk::grab || $o->{grab}; $o; } sub main($;$) { diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc index f826d04a9..06bdee053 100644 --- a/perl-install/share/diskdrake.rc +++ b/perl-install/share/diskdrake.rc @@ -8,6 +8,11 @@ style "red" = "font" bg[NORMAL] = { 1.0, 0, 0 } bg[PRELIGHT] = { 0.9, 0, 0 } } +style "darkred" = "font" +{ + bg[NORMAL] = { 0.7, 0, 0 } + bg[PRELIGHT] = { 0.6, 0, 0 } +} style "green" = "font" { bg[NORMAL] = { 0, 1.0, 0 } @@ -28,6 +33,7 @@ style "white" = "font" widget "*Linux*" style "red" widget "*Ext2*" style "red" +widget "*ReiserFS*" style "darkred" widget "*Linux swap*" style "green" widget "*Swap*" style "green" widget "*FAT*" style "blue" |