/[smeserver]/rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-moveConsoleBackup.patch
ViewVC logotype

Diff of /rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-moveConsoleBackup.patch

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

Revision 1.1 by wellsi, Fri Mar 21 05:00:59 2014 UTC Revision 1.2 by wellsi, Sat Mar 22 17:44:13 2014 UTC
# Line 1  Line 1 
1  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  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
2  --- 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.p28/root/sbin/e-smith/console-menu-items/usbBackup.pl  1969-12-31 16:00:00.000000000 -0800
3  +++ e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbBackup.pl      2008-03-26 09:48:59.000000000 -0700  +++ e-smith-backup-2.4.0.p29/root/sbin/e-smith/console-menu-items/usbBackup.pl  2014-03-20 22:04:42.000000000 -0700
4  @@ -0,0 +1,3 @@  @@ -0,0 +1,3 @@
5  +package esmith::console::perform_backup;  +package esmith::console::perform_backup;
6  +use esmith::console::perform_backup;  +use esmith::console::perform_backup;
7  +return new esmith::console::perform_backup;  +return new esmith::console::perform_backup;
8  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  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
9  --- 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.p28/root/sbin/e-smith/console-menu-items/usbRestore.pl 1969-12-31 16:00:00.000000000 -0800
10  +++ e-smith-backup-2.4.0/root/sbin/e-smith/console-menu-items/usbRestore.pl     2014-03-08 14:30:43.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
11  @@ -0,0 +1,3 @@  @@ -0,0 +1,3 @@
12  +package esmith::console::perform_restore;  +package esmith::console::perform_restore;
13  +use esmith::console::perform_restore;  +use esmith::console::perform_restore;
14  +return new esmith::console::perform_restore;  +return new esmith::console::perform_restore;
15  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  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
16  --- 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.p28/root/usr/share/perl5/vendor_perl/esmith/console/backup_running.pm  1969-12-31 16:00:00.000000000 -0800
17  +++ 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  +++ 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
18  @@ -0,0 +1,61 @@  @@ -0,0 +1,61 @@
19  +package esmith::console::backup_running;  +package esmith::console::backup_running;
20  +use strict;  +use strict;
# Line 77  diff -ruN e-smith-backup-2.4.0.old/root/ Line 77  diff -ruN e-smith-backup-2.4.0.old/root/
77  +  +
78  +1;  +1;
79  +  +
80  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  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
81  --- 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.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_backup.pm  1969-12-31 16:00:00.000000000 -0800
82  +++ 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  +++ 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
83  @@ -0,0 +1,256 @@  @@ -0,0 +1,256 @@
84  +package esmith::console::perform_backup;  +package esmith::console::perform_backup;
85  +use strict;  +use strict;
# Line 337  diff -ruN e-smith-backup-2.4.0.old/root/ Line 337  diff -ruN e-smith-backup-2.4.0.old/root/
337  +#esmith::console::perform_backup->new->doit(esmith::console->new,  +#esmith::console::perform_backup->new->doit(esmith::console->new,
338  +# esmith::ConfigDB->open);  +# esmith::ConfigDB->open);
339  +1;  +1;
340  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  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
341  --- 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.p28/root/usr/share/perl5/vendor_perl/esmith/console/perform_restore.pm 1969-12-31 16:00:00.000000000 -0800
342  +++ 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  +++ 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
343  @@ -0,0 +1,163 @@  @@ -0,0 +1,182 @@
344  +package esmith::console::perform_restore;  +package esmith::console::perform_restore;
345  +use strict;  +use strict;
346  +use warnings;  +use warnings;
# Line 352  diff -ruN e-smith-backup-2.4.0.old/root/ Line 352  diff -ruN e-smith-backup-2.4.0.old/root/
352  +{  +{
353  +    my $class = shift;  +    my $class = shift;
354  +    my $self = {  +    my $self = {
355  +                    name => gettext("Perform restore from removable media"),  +                    name => gettext("Restore from removable media"),
356  +                    order => installOrder(),  +                    order => installOrder(),
357  +               };  +               };
358  +    bless $self, $class;  +    bless $self, $class;
# Line 373  diff -ruN e-smith-backup-2.4.0.old/root/ Line 373  diff -ruN e-smith-backup-2.4.0.old/root/
373  +sub doit  +sub doit
374  +{  +{
375  +    my ($self, $console, $db) = @_;  +    my ($self, $console, $db) = @_;
376    +    if ($db->get_prop('bootstrap-console', 'Run') eq 'yes') # called from bootstrap console
377    +    {
378    +        return if ($db->get_value('PasswordSet') eq 'yes'); # too late
379    +    }
380    +    return if ($db->get_prop('bootstrap-console', 'Restore') eq 'disabled');
381  +    my ($rc, $choice) = $console->yesno_page  +    my ($rc, $choice) = $console->yesno_page
382  +        (  +        (
383  +         title   => gettext("Restore From Backup"),  +         title   => gettext("Restore From Backup"),
# Line 480  diff -ruN e-smith-backup-2.4.0.old/root/ Line 485  diff -ruN e-smith-backup-2.4.0.old/root/
485  +    gunzip |  +    gunzip |
486  +    tar xf - > /dev/null ) 2>&1 |  +    tar xf - > /dev/null ) 2>&1 |
487  +    dialog --backtitle 'Restoring data' --guage 'Progress' 7 70");  +    dialog --backtitle 'Restoring data' --guage 'Progress' 7 70");
 +    $db->set_prop("bootstrap-console", "ForceSave", "yes");  
488  +    system("/bin/umount", "$device");  +    system("/bin/umount", "$device");
489  +    system("/etc/init.d/haldaemon", "stop");  +    system("/etc/init.d/haldaemon", "stop");
490  +    system("/etc/init.d/messagebus", "stop");  +    system("/etc/init.d/messagebus", "stop");
491  +    rmdir("/mnt/bootstrap-console-backup");  +    rmdir("/mnt/bootstrap-console-backup");
492  +    system("/sbin/e-smith/signal-event", "post-upgrade");  +    system("/sbin/e-smith/signal-event", "post-upgrade");
493    +    
494    +    unless ( $self->{bootstrap} )
495    +    {
496    +        $db->set_prop("bootstrap-console", "Run", "yes");
497    +        $db->set_prop("bootstrap-console", "ForceSave", "yes");
498    +        $db->set_prop("bootstrap-console", "Restore", "disabled");
499    +
500    +        system("/usr/bin/tput", "clear");
501    +        system("/sbin/e-smith/signal-event", "reboot");
502    +
503    +        # A bit of a hack to avoid the console restarting before the
504    +        # reboot takes effect.
505    +
506    +        sleep(600);
507    +    }
508  +    return;  +    return;
509  +}  +}
510  +  +

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed