--- rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-moveConsoleBackup.patch	2014/03/21 05:00:59	1.1
+++ rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-moveConsoleBackup.patch	2014/03/22 17:44:13	1.2
@@ -1,20 +1,20 @@
-diff -ruN e-smith-backup-2.4.0.old/root/sbin/e-smith/console-menu-items/usbBackup.pl e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbBackup.pl
---- e-smith-backup-2.4.0.old/root/sbin/e-smith/console-menu-items/usbBackup.pl	1969-12-31 16:00:00.000000000 -0800
-+++ e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbBackup.pl	2008-03-26 09:48:59.000000000 -0700
+diff -ruN e-smith-backup-2.4.0.p28/root/sbin/e-smith/console-menu-items/usbBackup.pl e-smith-backup-2.4.0.p29/root/sbin/e-smith/console-menu-items/usbBackup.pl
+--- e-smith-backup-2.4.0.p28/root/sbin/e-smith/console-menu-items/usbBackup.pl	1969-12-31 16:00:00.000000000 -0800
++++ e-smith-backup-2.4.0.p29/root/sbin/e-smith/console-menu-items/usbBackup.pl	2014-03-20 22:04:42.000000000 -0700
 @@ -0,0 +1,3 @@
 +package esmith::console::perform_backup;
 +use esmith::console::perform_backup;
 +return new esmith::console::perform_backup;
-diff -ruN e-smith-backup-2.4.0.old/root/sbin/e-smith/console-menu-items/usbRestore.pl e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbRestore.pl
---- e-smith-backup-2.4.0.old/root/sbin/e-smith/console-menu-items/usbRestore.pl	1969-12-31 16:00:00.000000000 -0800
-+++ e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbRestore.pl	2014-03-08 14:30:43.000000000 -0800
+diff -ruN e-smith-backup-2.4.0.p28/root/sbin/e-smith/console-menu-items/usbRestore.pl e-smith-backup-2.4.0.p29/root/sbin/e-smith/console-menu-items/usbRestore.pl
+--- e-smith-backup-2.4.0.p28/root/sbin/e-smith/console-menu-items/usbRestore.pl	1969-12-31 16:00:00.000000000 -0800
++++ e-smith-backup-2.4.0.p29/root/sbin/e-smith/console-menu-items/usbRestore.pl	2014-03-20 22:04:42.000000000 -0700
 @@ -0,0 +1,3 @@
 +package esmith::console::perform_restore;
 +use esmith::console::perform_restore;
 +return new esmith::console::perform_restore;
-diff -ruN e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm
---- e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm	1969-12-31 16:00:00.000000000 -0800
-+++ e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm	2014-03-20 20:52:35.000000000 -0700
+diff -ruN e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm
+--- e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm	1969-12-31 16:00:00.000000000 -0800
++++ e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm	2014-03-20 22:04:42.000000000 -0700
 @@ -0,0 +1,61 @@
 +package esmith::console::backup_running;
 +use strict;
@@ -77,9 +77,9 @@ diff -ruN e-smith-backup-2.4.0.old/root/
 +
 +1;
 +
-diff -ruN e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm
---- e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm	1969-12-31 16:00:00.000000000 -0800
-+++ e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm	2014-03-20 20:55:03.000000000 -0700
+diff -ruN e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm
+--- e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm	1969-12-31 16:00:00.000000000 -0800
++++ e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm	2014-03-20 22:04:42.000000000 -0700
 @@ -0,0 +1,256 @@
 +package esmith::console::perform_backup;
 +use strict;
@@ -337,10 +337,10 @@ diff -ruN e-smith-backup-2.4.0.old/root/
 +#esmith::console::perform_backup->new->doit(esmith::console->new,
 +# esmith::ConfigDB->open);
 +1;
-diff -ruN e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm
---- e-smith-backup-2.4.0.old/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm	1969-12-31 16:00:00.000000000 -0800
-+++ e-smith-backup-2.4.0/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm	2014-03-08 14:30:43.000000000 -0800
-@@ -0,0 +1,163 @@
+diff -ruN e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm
+--- e-smith-backup-2.4.0.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm	1969-12-31 16:00:00.000000000 -0800
++++ e-smith-backup-2.4.0.p29/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm	2014-03-20 21:35:22.000000000 -0700
+@@ -0,0 +1,182 @@
 +package esmith::console::perform_restore;
 +use strict;
 +use warnings;
@@ -352,7 +352,7 @@ diff -ruN e-smith-backup-2.4.0.old/root/
 +{
 +    my $class = shift;
 +    my $self = {
-+                    name => gettext("Perform restore from removable media"),
++                    name => gettext("Restore from removable media"),
 +                    order => installOrder(),
 +               };
 +    bless $self, $class;
@@ -373,6 +373,11 @@ diff -ruN e-smith-backup-2.4.0.old/root/
 +sub doit
 +{
 +    my ($self, $console, $db) = @_;
++    if ($db->get_prop('bootstrap-console', 'Run') eq 'yes') # called from bootstrap console 
++    {
++        return if ($db->get_value('PasswordSet') eq 'yes'); # too late
++    }
++    return if ($db->get_prop('bootstrap-console', 'Restore') eq 'disabled');
 +    my ($rc, $choice) = $console->yesno_page
 +        (
 +         title   => gettext("Restore From Backup"),
@@ -480,12 +485,26 @@ diff -ruN e-smith-backup-2.4.0.old/root/
 +    gunzip |
 +    tar xf - > /dev/null ) 2>&1 |
 +    dialog --backtitle 'Restoring data' --guage 'Progress' 7 70");
-+    $db->set_prop("bootstrap-console", "ForceSave", "yes");
 +    system("/bin/umount", "$device");
 +    system("/etc/init.d/haldaemon", "stop");
 +    system("/etc/init.d/messagebus", "stop");
 +    rmdir("/mnt/bootstrap-console-backup");
 +    system("/sbin/e-smith/signal-event", "post-upgrade");
++    
++    unless ( $self->{bootstrap} )
++    {
++        $db->set_prop("bootstrap-console", "Run", "yes");
++        $db->set_prop("bootstrap-console", "ForceSave", "yes");
++        $db->set_prop("bootstrap-console", "Restore", "disabled");
++
++        system("/usr/bin/tput", "clear");
++        system("/sbin/e-smith/signal-event", "reboot");
++
++        # A bit of a hack to avoid the console restarting before the
++        # reboot takes effect.
++
++        sleep(600);
++    }
 +    return;
 +}
 +