summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 10:49:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 10:49:26 +0000
commitddf3954a198c6f0ca8c3e3e1587a844caf945a55 (patch)
tree161d610a8d0ec838615ec9c4e49373bd03381f47
parent3aa0c1b20adfec6ec15221c2a99b5313d443bfbc (diff)
downloaddrakx-ddf3954a198c6f0ca8c3e3e1587a844caf945a55.tar
drakx-ddf3954a198c6f0ca8c3e3e1587a844caf945a55.tar.gz
drakx-ddf3954a198c6f0ca8c3e3e1587a844caf945a55.tar.bz2
drakx-ddf3954a198c6f0ca8c3e3e1587a844caf945a55.tar.xz
drakx-ddf3954a198c6f0ca8c3e3e1587a844caf945a55.zip
when upgrading by removing pkgs, ensure we keep the previous runlevel
-rw-r--r--perl-install/install_steps.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ce734461b..8a731e6df 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -571,6 +571,13 @@ EOF
renamef(pkgs::removed_pkgs_to_upgrade_file(), pkgs::removed_pkgs_to_upgrade_file() . '.done');
unlink(glob("$::prefix/root/drakx/*.upgrading"));
+ if ($o->{upgrade_by_removing_pkgs_matching}) {
+ if (cat_("$::prefix/etc/inittab.rpmsave") =~ /^id:(\d):initdefault:\s*$/m) {
+ $o->{X}{xdm} = $1;
+ log::l("runlevel is $o->{X}{xdm} (as found in previous inittab)");
+ }
+ }
+
any::fix_broken_alternatives($o->{isUpgrade} eq 'redhat');
#- update theme directly from a package (simplest).