1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.14.0/createlinks mezzanine_patched_e-smith-backup-1.14.0/createlinks |
2 |
|
|
--- e-smith-backup-1.14.0/createlinks 2006-03-15 04:08:45.000000000 +1100 |
3 |
|
|
+++ mezzanine_patched_e-smith-backup-1.14.0/createlinks 2006-04-05 17:51:14.957976031 +1000 |
4 |
|
|
@@ -23,7 +23,6 @@ |
5 |
|
|
|
6 |
|
|
$event = "bootstrap-console-save"; |
7 |
|
|
|
8 |
|
|
-templates2events("/etc/cron.d/backup", $event); |
9 |
|
|
event_link("reset-restore-idle-flag", $event, "95"); |
10 |
|
|
|
11 |
|
|
#-------------------------------------------------- |
12 |
|
|
@@ -32,7 +31,7 @@ |
13 |
|
|
|
14 |
|
|
$event = "conf-backup"; |
15 |
|
|
|
16 |
|
|
-templates2events("/etc/cron.d/backup", $event); |
17 |
|
|
+templates2events("/etc/crontab", $event); |
18 |
|
|
|
19 |
|
|
#-------------------------------------------------- |
20 |
|
|
# events for rewind-tape action |
21 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/cron.d/backup mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/cron.d/backup |
22 |
|
|
--- e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/cron.d/backup 2006-03-15 04:08:45.000000000 +1100 |
23 |
|
|
+++ mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/cron.d/backup 1970-01-01 10:00:00.000000000 +1000 |
24 |
|
|
@@ -1,45 +0,0 @@ |
25 |
|
|
-{ |
26 |
|
|
- use POSIX; |
27 |
|
|
- use Locale::gettext; |
28 |
|
|
- use esmith::I18N; |
29 |
|
|
- |
30 |
|
|
- my $i18n = new esmith::I18N; |
31 |
|
|
- |
32 |
|
|
- $i18n->setLocale('backup'); |
33 |
|
|
- |
34 |
|
|
- $OUT = ''; |
35 |
|
|
- |
36 |
|
|
- my $status = $backup{status} || 'disabled'; |
37 |
|
|
- |
38 |
|
|
- unless ($status eq 'enabled') |
39 |
|
|
- { |
40 |
|
|
- $OUT .= "# ",gettext("Backup task is disabled"); |
41 |
|
|
- return; |
42 |
|
|
- } |
43 |
|
|
- |
44 |
|
|
- # FIXME - "mt tell" won't work with all backup devices |
45 |
|
|
- my $device = $backup{Device} || "/dev/nst0"; |
46 |
|
|
- |
47 |
|
|
- my $reminderTime = $backup{reminderTime} || "14:00"; |
48 |
|
|
- my ($reminderHour, $reminderMin) = split (":", $reminderTime, -1); |
49 |
|
|
- |
50 |
|
|
- |
51 |
|
|
- # remove leading zeros from minutes |
52 |
|
|
- $reminderMin =~ s/00/0/; |
53 |
|
|
- |
54 |
|
|
- $OUT .= |
55 |
|
|
- "$reminderMin $reminderHour * * * root" |
56 |
|
|
- . " /bin/mt -f $device status | grep ONLINE > /dev/null 2>&1 ||" |
57 |
|
|
- . ' echo "' . gettext("Remember to load the backup tape!") . '"' |
58 |
|
|
- . "\n"; |
59 |
|
|
- |
60 |
|
|
- my $backupTime = $backup{backupTime} || "2:00"; |
61 |
|
|
- my ($backupHour, $backupMin) = split (":", $backupTime, -1); |
62 |
|
|
- |
63 |
|
|
- # remove leading zeros from minutes |
64 |
|
|
- $backupMin =~ s/00/0/; |
65 |
|
|
- |
66 |
|
|
- $OUT .= |
67 |
|
|
- "$backupMin $backupHour * * * root" |
68 |
|
|
- . " /sbin/e-smith/do_backup" |
69 |
|
|
-} |
70 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/crontab/backup mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/crontab/backup |
71 |
|
|
--- e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/crontab/backup 1970-01-01 10:00:00.000000000 +1000 |
72 |
|
|
+++ mezzanine_patched_e-smith-backup-1.14.0/root/etc/e-smith/templates/etc/crontab/backup 2006-03-15 04:08:45.000000000 +1100 |
73 |
|
|
@@ -0,0 +1,45 @@ |
74 |
|
|
+{ |
75 |
|
|
+ use POSIX; |
76 |
|
|
+ use Locale::gettext; |
77 |
|
|
+ use esmith::I18N; |
78 |
|
|
+ |
79 |
|
|
+ my $i18n = new esmith::I18N; |
80 |
|
|
+ |
81 |
|
|
+ $i18n->setLocale('backup'); |
82 |
|
|
+ |
83 |
|
|
+ $OUT = ''; |
84 |
|
|
+ |
85 |
|
|
+ my $status = $backup{status} || 'disabled'; |
86 |
|
|
+ |
87 |
|
|
+ unless ($status eq 'enabled') |
88 |
|
|
+ { |
89 |
|
|
+ $OUT .= "# ",gettext("Backup task is disabled"); |
90 |
|
|
+ return; |
91 |
|
|
+ } |
92 |
|
|
+ |
93 |
|
|
+ # FIXME - "mt tell" won't work with all backup devices |
94 |
|
|
+ my $device = $backup{Device} || "/dev/nst0"; |
95 |
|
|
+ |
96 |
|
|
+ my $reminderTime = $backup{reminderTime} || "14:00"; |
97 |
|
|
+ my ($reminderHour, $reminderMin) = split (":", $reminderTime, -1); |
98 |
|
|
+ |
99 |
|
|
+ |
100 |
|
|
+ # remove leading zeros from minutes |
101 |
|
|
+ $reminderMin =~ s/00/0/; |
102 |
|
|
+ |
103 |
|
|
+ $OUT .= |
104 |
|
|
+ "$reminderMin $reminderHour * * * root" |
105 |
|
|
+ . " /bin/mt -f $device status | grep ONLINE > /dev/null 2>&1 ||" |
106 |
|
|
+ . ' echo "' . gettext("Remember to load the backup tape!") . '"' |
107 |
|
|
+ . "\n"; |
108 |
|
|
+ |
109 |
|
|
+ my $backupTime = $backup{backupTime} || "2:00"; |
110 |
|
|
+ my ($backupHour, $backupMin) = split (":", $backupTime, -1); |
111 |
|
|
+ |
112 |
|
|
+ # remove leading zeros from minutes |
113 |
|
|
+ $backupMin =~ s/00/0/; |
114 |
|
|
+ |
115 |
|
|
+ $OUT .= |
116 |
|
|
+ "$backupMin $backupHour * * * root" |
117 |
|
|
+ . " /sbin/e-smith/do_backup" |
118 |
|
|
+} |