summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm27
-rw-r--r--perl-install/install2.pm18
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm10
5 files changed, 7 insertions, 54 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 29bf33959..2010c625e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -746,33 +746,6 @@ wait for default boot.
any::set_login_serial_console($port, $speed);
}
- #- add a restore entry if installation is done from disk, in order to allow redoing it.
- if (my $hd_install_path = any::hdInstallPath()) {
- my ($cmdline, $vga);
- if ($::restore && -e "/tmp/image/boot/vmlinuz" && -e "/tmp/image/boot/all.rdz" &&
- ($cmdline = cat_("/tmp/image/boot/grub/menu.lst") =~ m|kernel \S+/boot/vmlinuz (.*)$|m)) {
- #- cmdline should'n have any reference to vga=...
- $cmdline =~ s/vga=(\S+)//g and $vga = $1;
- log::l("copying kernel and stage1 install to $::prefix/boot/restore");
- eval { mkdir "$::prefix/boot/restore";
- cp_af("/tmp/image/boot/vmlinuz", "$::prefix/boot/restore/vmlinuz");
- cp_af("/tmp/image/boot/all.rdz", "$::prefix/boot/restore/all.rdz") };
- unless ($@) {
- log::l("adding a restore bootloader entry on $hd_install_path (remapped to $::prefix/boot/restore)");
- add_entry($bootloader, {
- type => 'image',
- label => 'restore',
- kernel_or_dev => "/boot/restore/vmlinuz",
- initrd => "/boot/restore/all.rdz",
- append => "$cmdline recovery", #- the restore entry is a recovery entry
- if_($vga, vga => $vga),
- });
- }
- } else {
- log::l("no restore bootloader need to be used on $hd_install_path");
- }
- }
-
my @kernels = get_kernels_and_labels() or die "no kernel installed";
foreach my $kernel (@kernels) {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5d006aa17..2a64574db 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -381,7 +381,6 @@ sub main {
map_each {
my ($n, $v) = @_;
my $f = ${{
- oem => sub { $::oem = $v },
lang => sub { $o->{locale}{lang} = $v },
flang => sub { $o->{locale}{lang} = $v; push @auto, 'selectLanguage' },
method => sub { $o->{method} = $v },
@@ -399,8 +398,6 @@ sub main {
testing => sub { $::testing = 1 },
patch => sub { $patch = 1 },
defcfg => sub { $cfg = $v },
- recovery => sub { $::recovery = 1 },
- restore => sub { $::restore = 1 },
newt => sub { $o->{interactive} = "newt" },
text => sub { $o->{interactive} = "newt" },
stdio => sub { $o->{interactive} = "stdio" },
@@ -534,9 +531,6 @@ sub main {
#- oem patch should be read before to still allow patch or defcfg.
eval { $o = $::o = install_any::loadO($o, "install/patch-oem.pl"); log::l("successfully read oem patch") };
- #- recovery mode should be read early to allow default parameter to be taken.
- eval { $o = $::o = install_any::loadO($o, "install/recovery.cfg"); log::l("successfully read recovery") } if $::recovery;
- $@ and $::recovery = 0; #- avoid keeping recovery if there was a problem reading the recovery.cfg file.
#- patch should be read after defcfg in order to take precedance.
eval { $o = $::o = install_any::loadO($o, $cfg); log::l("successfully read default configuration: $cfg") } if $cfg;
eval { $o = $::o = install_any::loadO($o, "patch"); log::l("successfully read patch") } if $patch;
@@ -580,14 +574,6 @@ sub main {
$o->{meta_class} eq 'powerpackplus' and $o->{meta_class} = 'server';
log::l("meta_class $o->{meta_class}");
- if ($::oem) {
- $o->{partitioning}{use_existing_root} = 1;
- $o->{compssListLevel} = 4;
- push @auto, 'selectInstallClass', 'doPartitionDisks', 'choosePackages', 'configureTimezone', 'exitInstall';
- }
- if ($::recovery) {
- push @auto, 'selectLanguage', 'selectInstallClass', 'selectMouse', 'selectKeyboard', 'doPartitionDisks', 'formatPartitions', 'miscellaneous', 'choosePackages', 'configureTimezone';
- }
foreach (@auto) {
my $s = $o->{steps}{/::(.*)/ ? $1 : $_} or next;
@@ -650,10 +636,6 @@ sub main {
$o->{modules_conf}->write;
detect_devices::install_addons($o->{prefix});
- #- save recovery file if needed (ie disk style install).
- $o->{method} eq 'disk' and
- output($o->{prefix} . any::hdInstallPath() . '/install/recovery.cfg', install_any::g_auto_install(1));
-
#- mainly for auto_install's
#- do not use run_program::xxx because it doesn't leave stdin/stdout unchanged
system("bash", "-c", $o->{postInstallNonRooted}) if $o->{postInstallNonRooted};
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 716a5c66b..0752c50d5 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -211,7 +211,7 @@ sub doPartitionDisksAfter {
die N("You must have a FAT partition mounted in /boot/efi");
}
- if ($o->{partitioning}{use_existing_root} && !$::recovery) {
+ if ($o->{partitioning}{use_existing_root}) {
#- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat
fs::mount_part($_, $o->{prefix}) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} }
grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}};
@@ -267,7 +267,7 @@ sub choosePartitionsToFormat($$) {
$_->{mntpoint} or next;
add2hash_($_, { toFormat => $_->{notFormatted} }) if $_->{fs_type}; #- eg: don't set toFormat for isRawRAID (0xfd)
- $_->{$::recovery ? 'toFormat' : 'toFormatUnsure'} ||= member($_->{mntpoint}, '/', '/usr');
+ $_->{toFormatUnsure} ||= member($_->{mntpoint}, '/', '/usr');
if (!$_->{toFormat}) {
my $fs_type = fs::type::fs_type_from_magic($_);
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index d8e11ac25..e7ab57d7a 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -559,7 +559,7 @@ sub installPackages {
my ($method, $medium) = @_;
#- if not using a cdrom medium or an iso image, always abort.
- return if !install_any::method_allows_medium_change($method) || $::oem;
+ return if !install_any::method_allows_medium_change($method);
my $name = pkgs::mediumDescr($o->{packages}, $medium);
local $| = 1; print "\a";
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ddb61d568..40ab337bb 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -82,16 +82,14 @@ sub acceptLicense {
my $r = $::testing ? 'Accept' : 'Refuse';
- ($::recovery ?
- $o->ask_yesorno('', N("Do you want to recover your system?"), 0) :
- $o->ask_from_({ title => N("License agreement"),
+ $o->ask_from_({ title => N("License agreement"),
cancel => N("Quit"),
messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()),
interactive_help_id => 'acceptLicense',
more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ],
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
- [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ]))
+ [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ])
or do {
if ($::globetrotter) {
system("killall XFree86");
@@ -450,7 +448,7 @@ sub choosePackages {
#- this is done at the very beginning to take into account
#- selection of CD by user if using a cdrom.
- $o->chooseCD($packages) if install_any::method_allows_medium_change($o->{method}) && !$::oem;
+ $o->chooseCD($packages) if install_any::method_allows_medium_change($o->{method});
my $w = $o->wait_message('', N("Looking for available packages..."));
my $availableC = &install_steps::choosePackages;
@@ -741,7 +739,7 @@ sub installPackages {
my ($method, $medium) = @_;
#- if not using a cdrom medium or an iso image, always abort.
- return if !install_any::method_allows_medium_change($method) || $::oem;
+ return if !install_any::method_allows_medium_change($method);
my $name = pkgs::mediumDescr($o->{packages}, $medium);
local $| = 1; print "\a";
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 22:50:53 +0000