/[smeserver]/rpms/e-smith-backup/sme10/e-smith-backup-2.6.0-bz9550.fixconsolerestore.patch
ViewVC logotype

Contents of /rpms/e-smith-backup/sme10/e-smith-backup-2.6.0-bz9550.fixconsolerestore.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Fri Feb 17 19:32:58 2017 UTC (7 years, 9 months ago) by unnilennium
Branch: MAIN
CVS Tags: e-smith-backup-2_6_0-24_el7_sme, e-smith-backup-2_6_0-19_el7_sme, e-smith-backup-2_6_0-17_el7_sme, e-smith-backup-2_6_0-30_el7_sme, e-smith-backup-2_6_0-29_el7_sme, e-smith-backup-2_6_0-9_el7_sme, e-smith-backup-2_6_0-15_el7_sme, e-smith-backup-2_6_0-18_el7_sme, e-smith-backup-2_6_0-16_el7_sme, e-smith-backup-2_6_0-11_el7_sme, e-smith-backup-2_6_0-14_el7_sme, e-smith-backup-2_6_0-8_el7_sme, e-smith-backup-2_6_0-20_el7_sme, e-smith-backup-2_6_0-23_el7_sme, e-smith-backup-2_6_0-10_el7_sme, e-smith-backup-2_6_0-21_el7_sme, e-smith-backup-2_6_0-13_el7_sme, e-smith-backup-2_6_0-28_el7_sme, e-smith-backup-2_6_0-12_el7_sme, e-smith-backup-2_6_0-22_el7_sme, e-smith-backup-2_6_0-27_el7_sme, e-smith-backup-2_6_0-25_el7_sme, e-smith-backup-2_6_0-7_el7_sme, e-smith-backup-2_6_0-26_el7_sme, HEAD
* Fri Feb 17 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
- console restoration can be launched again from console [SME: 9550]

1 --- e-smith-backup-2.6.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm.fixconsolerestore 2016-08-10 13:37:08.000000000 -0400
2 +++ e-smith-backup-2.6.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm 2017-02-17 14:16:11.144742658 -0500
3 @@ -11,6 +11,8 @@
4 my $self = {
5 name => gettext("Restore from removable media"),
6 order => installOrder(),
7 + bootstrap => 0,
8 + @_,
9 };
10 bless $self, $class;
11 return $self;
12 @@ -29,8 +31,8 @@
13
14 sub doit
15 {
16 - my ($self, $console, $db) = @_;
17 - return if ($db->get_prop('bootstrap-console', 'Run') eq 'no'); # regular reboot
18 + my ($self, $console, $db) = @_;
19 + return if (($db->get_prop('bootstrap-console', 'Run') eq 'no') && $self->{bootstrap} ); # regular reboot
20 if ($db->get_prop('bootstrap-console', 'Run') eq 'yes') # called from bootstrap console
21 {
22 return if ($db->get_value('PasswordSet') eq 'yes'); # too late

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed