summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-04-03 06:40:59 +0000
committerThierry Vignaud <tv@mandriva.org>2008-04-03 06:40:59 +0000
commit17e5420e2253dd4f00bd46919babcaafc004f524 (patch)
treeacd6d547e9ff20c15ae2f6238615eb5b6077a76e
parent4af15017a550c2b365b1194430c98295030e9ca6 (diff)
downloaddrakx-17e5420e2253dd4f00bd46919babcaafc004f524.tar
drakx-17e5420e2253dd4f00bd46919babcaafc004f524.tar.gz
drakx-17e5420e2253dd4f00bd46919babcaafc004f524.tar.bz2
drakx-17e5420e2253dd4f00bd46919babcaafc004f524.tar.xz
drakx-17e5420e2253dd4f00bd46919babcaafc004f524.zip
enable to restore the system through rsnapshot if giving "restore" on cmdline
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm1
-rw-r--r--perl-install/install/steps_interactive.pm5
-rw-r--r--perl-install/mygtk2.pm1
4 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4102804fe..efe2f8a7f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
- 2008.1 logo (the good one)
+- enable to restore the system through rsnapshot if giving "restore"
+ on cmdline
- fix broken help because of s/pt_BR/pt_br/ change in file names (#36774)
Version 10.26 - 2 April 2008
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index ab09f0874..dc59f62f5 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -372,6 +372,7 @@ sub main {
updatemodules => sub { $o->{updatemodules} = 1 },
suppl => sub { $o->{supplmedia} = 1 },
askmedia => sub { $o->{askmedia} = 1 },
+ restore => sub { $::isRestore = 1 },
}}{lc $n}; &$f if $f;
} %cmdline;
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 84984e32c..9b167551a 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -109,6 +109,11 @@ sub selectKeyboard {
}
keyboard::group_toggle_choose($o, $o->{keyboard}) or goto &selectKeyboard;
install::steps::selectKeyboard($o);
+ if ($::isRestore) {
+ require MDV::Snapshot::Restore;
+ MDV::Snapshot::Restore::main($o);
+ $o->exit;
+ }
}
#------------------------------------------------------------------------------
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 6f5bc48d1..014725b46 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -20,6 +20,7 @@ sub init() {
Gtk2->init;
Locale::gettext::bind_textdomain_codeset($_, 'UTF8') foreach 'libDrakX', if_(!$::isInstall, 'libDrakX-standalone'),
+ if_($::isInstall, 'draksnapshot'),
'drakx-net', 'drakx-kbd-mouse-x11', # shared translation
@::textdomains;
Gtk2->croak_execeptions;