1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm |
2 |
|
|
--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm 2007-07-01 10:57:41.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_backup.pm 2007-07-01 10:55:48.000000000 -0600 |
4 |
|
|
@@ -151,7 +151,7 @@ |
5 |
|
|
); |
6 |
|
|
return unless $rc == 0; |
7 |
|
|
sleep(3); |
8 |
|
|
- my @dirs; |
9 |
slords |
1.2 |
+ my @dirs = 0; |
10 |
slords |
1.1 |
open(FSTAB, "</etc/fstab"); |
11 |
|
|
while (<FSTAB>) |
12 |
|
|
{ |
13 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm |
14 |
|
|
--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-07-01 10:57:41.000000000 -0600 |
15 |
|
|
+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-07-01 10:57:15.000000000 -0600 |
16 |
|
|
@@ -42,7 +42,7 @@ |
17 |
|
|
return; |
18 |
|
|
} |
19 |
|
|
sleep(3); |
20 |
|
|
- my @dirs; |
21 |
slords |
1.2 |
+ my @dirs = 0; |
22 |
slords |
1.1 |
open(FSTAB, "</etc/fstab"); |
23 |
|
|
while (<FSTAB>) |
24 |
|
|
{ |
25 |
|
|
@@ -86,6 +86,7 @@ |
26 |
|
|
|
27 |
|
|
unless (-f "$device/smeserver.tgz") |
28 |
|
|
{ |
29 |
|
|
+ system("/bin/umount", "$device"); |
30 |
|
|
($rc, $choice) = $console->message_page |
31 |
|
|
( |
32 |
|
|
title => gettext("Backup file not found"), |
33 |
|
|
@@ -107,7 +108,10 @@ |
34 |
|
|
"\n\n" . |
35 |
|
|
gettext("Do you wish to restore from this file?"), |
36 |
|
|
); |
37 |
|
|
- goto INITIATE_RESTORE unless ($rc == 0); |
38 |
|
|
+ unless ($rc == 0) { |
39 |
|
|
+ system("/bin/umount", "$device"); |
40 |
|
|
+ goto INITIATE_RESTORE; |
41 |
|
|
+ } |
42 |
|
|
system("/sbin/e-smith/signal-event", "pre-restore"); |
43 |
|
|
system("(cd / ; cat $device/smeserver.tgz | |
44 |
|
|
pv -n -s $size | |