1 |
unnilennium |
1.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 |