Changeset 3141 in MondoRescue
- Timestamp:
- Jun 13, 2013, 6:05:57 PM (11 years ago)
- Location:
- branches/3.0
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo-doc/mondoarchive.8
r3138 r3141 273 273 274 274 .TP 275 .BI "\-F " 276 Do not retry when a command failed but just exits. This is useful for an 277 automated mode launched from cron where you want to avoid filling your logs 278 due to an answer which is impossible to give. 279 280 .TP 275 281 .BI "\-G " 276 282 Use gzip, the standard and quicker Linux compression engine, instead of bzip2. -
branches/3.0/mondo/src/common/libmondo-cli.c
r3138 r3141 20 20 extern int g_loglevel; 21 21 extern bool g_text_mode; 22 extern bool g_fail_immediately; 22 23 extern char g_startdir[MAX_STR_LEN]; ///< ????? @bug ????? 23 24 extern char *MONDO_OPTIONS; … … 909 910 ("Please install LZOP. You can't use '-L' until you do.\n"); 910 911 } 912 } 913 914 if (flag_set['F']) { 915 log_msg(3, "-F means we will fail immediately at the first interaction request"); 916 g_fail_immediately = TRUE; 911 917 } 912 918 -
branches/3.0/mondo/src/common/libmondo-filelist.c
r3139 r3141 214 214 char *incoming = NULL; 215 215 char *tmp = NULL; 216 char *p = NULL;217 216 218 217 /*@ pointers *********************************** */ … … 920 919 for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin); 921 920 tmp1 = fgets(fname, MAX_STR_LEN, pin)) { 922 if ((fname[strlen(fname) - 1] == 13 923 || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) { 921 if (((fname[strlen(fname) - 1] == 13) || (fname[strlen(fname) - 1] == 10)) && (strlen(fname) > 0)) { 924 922 fname[strlen(fname) - 1] = '\0'; 925 923 } -
branches/3.0/mondo/src/common/newt-specific.c
r3114 r3141 55 55 */ 56 56 bool g_exiting = FALSE; 57 58 // Decide whether we should continue to ask questions or exit (cron use case) 59 extern bool g_fail_immediately; 57 60 58 61 /** … … 125 128 char *p; 126 129 127 assert_string_is_neither_NULL_nor_zerolength(prompt); 128 130 assert_string_is_neither_NULL_nor_zerolength(prompt); 131 132 if (g_fail_immediately) { 133 // We consider the user aborted by using the -F option 134 log_msg(3, "Exiting at first interaction request due to -F"); 135 finish(1); 136 } 129 137 if (g_text_mode) { 130 138 … … 179 187 int i; 180 188 189 assert_string_is_neither_NULL_nor_zerolength(prompt); 190 if (g_fail_immediately) { 191 // We consider the user aborted by using the -F option 192 log_msg(3, "Exiting at first interaction request due to -F"); 193 finish(1); 194 } 181 195 tmp = malloc(MAX_NEWT_COMMENT_LEN); 182 assert_string_is_neither_NULL_nor_zerolength(prompt);183 196 if (g_text_mode) { 184 197 paranoid_system("sync"); -
branches/3.0/mondo/src/mondoarchive/mondoarchive.c
r3060 r3141 45 45 */ 46 46 bool g_ISO_restore_mode = FALSE; 47 48 /* Whether we should fail immediately at first error */ 49 bool g_fail_immediately = FALSE; 47 50 48 51 /* Do we use extended attributes and acl ? -
branches/3.0/mondo/src/mondoarchive/mondoarchive.h
r3139 r3141 9 9 */ 10 10 char *MONDO_LOGFILE = "/var/log/mondoarchive.log"; 11 char *MONDO_OPTIONS = "0123456789A:B:C:DE: GHI:J:K:LM:NOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";11 char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"; 12 12 13 13 /* No restriction on ps options */ -
branches/3.0/mondo/src/mondorestore/mondorestore.c
r3116 r3141 63 63 */ 64 64 bool g_ISO_restore_mode = FALSE; /* are we in Iso Mode? */ 65 66 /* Whether we should fail immediately at first error */ 67 bool g_fail_immediately = FALSE; 65 68 66 69 /** -
branches/3.0/mondo/test/test-mountlist.c
r2991 r3141 26 26 extern int g_partition_table_locked_up; 27 27 extern int g_noof_rows; 28 29 /* Whether we should fail immediately at first error */ 30 bool g_fail_immediately = FALSE; 28 31 29 32 bool g_ISO_restore_mode = FALSE; /* are we in Iso Mode? */ -
branches/3.0/mondo/test/test-mr_stresc.c
r3116 r3141 8 8 #include <stdlib.h> 9 9 #include "mr_str.h" 10 #include "my-stuff.h" 11 12 /* Whether we should fail immediately at first error */ 13 bool g_fail_immediately = FALSE; 10 14 11 15 void (*mr_cleanup)(void) = NULL; 12 16 13 char * *strl= {17 char *strl[] = { 14 18 "test with space", 15 19 "test with \ backslash", -
branches/3.0/mondo/test/test-truncname.c
r3116 r3141 22 22 extern int g_partition_table_locked_up; 23 23 extern int g_noof_rows; 24 25 /* Whether we should fail immediately at first error */ 26 bool g_fail_immediately = FALSE; 24 27 25 28 bool g_ISO_restore_mode = FALSE; /* are we in Iso Mode? */
Note:
See TracChangeset
for help on using the changeset viewer.