1 |
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 |
2 |
--- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-06-11 20:46:27.000000000 -0600 |
3 |
+++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/perform_restore.pm 2007-06-11 20:46:02.000000000 -0600 |
4 |
@@ -25,6 +25,8 @@ |
5 |
gettext("Do you wish to restore from backup?"), |
6 |
); |
7 |
return unless $rc == 0; |
8 |
+ system("/etc/init.d/messagebus", "start"); |
9 |
+ system("/etc/init.d/haldaemon", "start"); |
10 |
INITIATE_RESTORE: |
11 |
($rc, $choice) = $console->yesno_page |
12 |
( |
13 |
@@ -34,7 +36,11 @@ |
14 |
text => |
15 |
gettext("Insert memory stick or CDROM containing your backup file, then hit the enter key."), |
16 |
); |
17 |
- return unless $rc == 0; |
18 |
+ unless ($rc == 0) { |
19 |
+ system("/etc/init.d/haldaemon", "stop"); |
20 |
+ system("/etc/init.d/messagebus", "stop"); |
21 |
+ return; |
22 |
+ } |
23 |
sleep(3); |
24 |
my @dirs; |
25 |
open(FSTAB, "</etc/fstab"); |
26 |
@@ -109,6 +115,9 @@ |
27 |
tar xf - > /dev/null ) 2>&1 | |
28 |
dialog --backtitle 'Restoring data' --guage 'Progress' 7 70"); |
29 |
$db->set_prop("bootstrap-console", "ForceSave", "yes"); |
30 |
+ system("/bin/umount", "$device"); |
31 |
+ system("/etc/init.d/haldaemon", "stop"); |
32 |
+ system("/etc/init.d/messagebus", "stop"); |
33 |
} |
34 |
|
35 |
#use esmith::console; |