summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/install2.pm26
-rw-r--r--perl-install/install_gtk.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/share/themes-mdk-Desktop.rc2
6 files changed, 15 insertions, 23 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index d0682ce8a..a8bbcf4f4 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -12,6 +12,10 @@
* install_gtk.pm: added Desktop themes.
* share/themes-mdk-Desktop.rc, share/themes/mdk-Desktop-bg.png:
initial release.
+ * install2.pm: moved back to all steps for live upgrade.
+ * install_gtk.pm: select right logo if desktop.
+ * install_steps_interactive, install_steps_gtk.pm: avoid asking if
+ upgrade for a live upgrade.
2000-09-22 Pixel <pixel@mandrakesoft.com>
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 939a1ddaf..68856df90 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -199,7 +199,6 @@ $o = $::o = {
#------------------------------------------------------------------------------
sub selectLanguage {
- $::live and return;
$o->selectLanguage($_[1] == 1);
addToBeDone {
@@ -210,7 +209,6 @@ sub selectLanguage {
#------------------------------------------------------------------------------
sub selectMouse {
- $::live and return;
my ($first_time) = $_[1] == 1;
add2hash($o->{mouse} ||= {}, mouse::read($o->{prefix})) if $o->{isUpgrade} && $first_time;
@@ -221,7 +219,6 @@ sub selectMouse {
#------------------------------------------------------------------------------
sub setupSCSI {
- $::live and return;
my ($clicked) = $_[0];
$o->{autoSCSI} ||= $::beginner;
@@ -230,7 +227,6 @@ sub setupSCSI {
#------------------------------------------------------------------------------
sub selectKeyboard {
- $::live and return;
my ($clicked) = $_[0];
return if !$o->{isUpgrade} && $::beginner && !$clicked;
@@ -247,7 +243,6 @@ sub selectKeyboard {
#------------------------------------------------------------------------------
sub selectInstallClass {
- $::live and return;
$o->selectInstallClass(@install_classes);
$o->{partitions} ||= $suggestedPartitions{$o->{installClass}};
@@ -268,7 +263,6 @@ sub selectInstallClass {
#------------------------------------------------------------------------------
sub doPartitionDisks {
- $::live and return;
$o->{steps}{formatPartitions}{done} = 0;
$o->doPartitionDisksBefore;
$o->doPartitionDisks;
@@ -276,7 +270,6 @@ sub doPartitionDisks {
}
sub formatPartitions {
- $::live and return;
unless ($o->{isUpgrade}) {
$o->choosePartitionsToFormat($o->{fstab});
$o->formatMountPartitions($o->{fstab}) unless $::testing;
@@ -342,7 +335,6 @@ sub installPackages {
}
#------------------------------------------------------------------------------
sub miscellaneous {
- $::live and return;
$o->miscellaneousBefore($_[0]);
$o->miscellaneous($_[0]);
@@ -370,17 +362,15 @@ VISOR=no
#------------------------------------------------------------------------------
sub configureNetwork {
- $::live and return;
#- get current configuration of network device.
require network;
eval { network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}) };
$o->configureNetwork($_[1] == 1);
}
#------------------------------------------------------------------------------
-sub installCrypto { $::live or $o->installCrypto }
+sub installCrypto { $o->installCrypto }
#------------------------------------------------------------------------------
sub configureTimezone {
- $::live and return;
my ($clicked) = @_;
my $f = "$o->{prefix}/etc/sysconfig/clock";
@@ -395,9 +385,9 @@ sub configureTimezone {
$o->configureTimezone($f, $clicked);
}
#------------------------------------------------------------------------------
-sub configureServices { $::live or $::expert and $o->configureServices }
+sub configureServices { $::expert and $o->configureServices }
#------------------------------------------------------------------------------
-sub configurePrinter { $::live or $o->configurePrinter($_[0]) }
+sub configurePrinter { $o->configurePrinter($_[0]) }
#------------------------------------------------------------------------------
sub setRootPassword {
return if $o->{isUpgrade};
@@ -415,14 +405,12 @@ sub addUser {
#------------------------------------------------------------------------------
sub createBootdisk {
- $::live and return;
modules::write_conf($o->{prefix});
$o->createBootdisk($_[1] == 1);
}
#------------------------------------------------------------------------------
sub setupBootloader {
- $::live and return;
return if $::g_auto_install;
modules::write_conf($o->{prefix});
@@ -435,7 +423,6 @@ sub setupBootloader {
}
#------------------------------------------------------------------------------
sub configureX {
- $::live and return;
my ($clicked) = $_[0];
#- done here and also at the end of install2.pm, just in case...
@@ -445,10 +432,10 @@ sub configureX {
$o->configureX if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked;
}
#------------------------------------------------------------------------------
-sub generateAutoInstFloppy { $::live or $o->generateAutoInstFloppy }
+sub generateAutoInstFloppy { $o->generateAutoInstFloppy }
#------------------------------------------------------------------------------
-sub exitInstall { $::live or $o->exitInstall(getNextStep() eq "exitInstall") }
+sub exitInstall { $o->exitInstall(getNextStep() eq "exitInstall") }
#-######################################################################################
@@ -562,8 +549,7 @@ sub main {
$s = $o->{steps}{$_};
}
$o->{isUpgrade} = 1;
- $::beginner = 0; #- use custom by default.
- $::expert = 1;
+ #$::beginner = 0; #- use custom by default.
}
mkdir $o->{prefix}, 0755;
mkdir $o->{root}, 0755;
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 9b16f93f4..acf5376fb 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -191,7 +191,7 @@ sub create_logo_window {
$w->{rwindow}->set_usize($::logowidth, $::logoheight);
$w->{rwindow}->set_name("logo");
$w->show;
- my $file = "logo-mandrake.xpm";
+ my $file = $o->{meta_class} eq 'desktop' ? "logo-mandrake-Desktop.xpm" : "logo-mandrake.xpm";
-r $file or $file = "$ENV{SHARE_PATH}/$file";
if (-r $file) {
my $ww = $w->{window};
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 3d1a6bfa0..b4c67284e 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -141,6 +141,8 @@ press `F1' when booting on CDROM, then enter `text'.")) if $first_time && availa
#------------------------------------------------------------------------------
sub selectInstallClass1 {
+ $::live and $o->SUPER::selectInstallClass1(@_);
+
my ($o, $verif, $l, $def, $l2, $def2) = @_;
my $w = my_gtk->new('');
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f2f9e3cd3..29ee25505 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -96,7 +96,7 @@ sub selectInstallClass1 {
my ($o, $verif, $l, $def, $l2, $def2) = @_;
$verif->($o->ask_from_list(_("Install Class"), _("Which installation class do you want?"), $l, $def));
- $o->ask_from_list_(_("Install/Rescue"), _("Is this an install or a rescue?"), $l2, $def2);
+ $::live or $o->ask_from_list_(_("Install/Rescue"), _("Is this an install or a rescue?"), $l2, $def2);
}
#------------------------------------------------------------------------------
diff --git a/perl-install/share/themes-mdk-Desktop.rc b/perl-install/share/themes-mdk-Desktop.rc
index e8589e708..36962c563 100644
--- a/perl-install/share/themes-mdk-Desktop.rc
+++ b/perl-install/share/themes-mdk-Desktop.rc
@@ -143,7 +143,7 @@ style "any"
bg[ACTIVE] = { 0.2, 0.2, 0.4 }
bg[PRELIGHT] = { 0.4, 0.4, 0.6 }
- text[NORMAL] = { 1.0, 1.0, 1.0 }
+ text[NORMAL] = { 0, 0, 0 }
fg[NORMAL] = { 1.0, 1.0, 1.0 }
fg[INSENSITIVE] = { 1.0, 1.0, 1.0 }
text[INSENSITIVE]={ 1.0, 1.0, 1.0 }
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-08 04:02:36 +0000