Changeset 2770 in MondoRescue
- Timestamp:
- Apr 21, 2011, 2:14:52 PM (14 years ago)
- Location:
- branches/2.2.9/mondo/src/mondorestore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/mondorestore/Makefile.am
r2209 r2770 14 14 sbin_PROGRAMS = mondorestore 15 15 mondorestore_SOURCES = mondo-prep.c mondorestore.c mondo-rstr-newt.c \ 16 mondo-rstr-compare.c mondo-rstr-tools.c 16 mondo-rstr-compare.c mondo-rstr-tools.c ../common/newt-specific.c 17 17 mondorestore_LDADD = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@ -
branches/2.2.9/mondo/src/mondorestore/mondo-prep.c
r2764 r2770 2472 2472 long long current_size_of_drive = 0LL; /* use KB interally for precision */ 2473 2473 long long original_size_of_drive = 0LL; /* use KB interally for precision */ 2474 long long final_size = 0LL; /* all in Megabytes */2475 2474 struct mountlist_reference *drivemntlist; 2476 2475 -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c
r2769 r2770 15 15 //static char cvsid[] = "$Id$"; 16 16 17 extern bool popup_with_buttons(char *p, char *button1, char *button2); 17 18 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN]; 18 19 … … 2278 2279 bool 2279 2280 get_isodir_info(char *isodir_device, char *isodir_format, 2280 char *isodir_path, bool nuke_me_please)2281 char *isodir_path, char *subdir_path, bool nuke_me_please) 2281 2282 { 2282 2283 2283 2284 bool HDD = FALSE; 2284 char *subdir_path;2285 2285 /** initialize ********************************************************/ 2286 2286 … … 2313 2313 "What is the disk format of the device? (Hit ENTER if you don't know.)", 2314 2314 isodir_format, 16)) { 2315 if (popup_with_button ("Are you restoring from an external hard drive ?", "Yes", "No")) {2315 if (popup_with_buttons("Are you restoring from an external hard drive ?", "Yes", "No")) { 2316 2316 HDD = TRUE; 2317 2317 } … … 2327 2327 /* We need an additional param */ 2328 2328 mr_asprintf(&subdir_path, "%s", isodir_path); 2329 bkpinfo->subdir = subdir_path;2330 2329 strcpy(isodir_path, "/tmp/isodir"); 2331 2330 } -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.h
r2394 r2770 141 141 int find_next_free_index_in_disklist(struct list_of_disks *); 142 142 int find_raid_device_in_raidlist(struct raidlist_itself *, char *); 143 bool get_isodir_info(char *, char *, char *, bool);143 bool get_isodir_info(char *, char *, char *, char *, bool); 144 144 void initiate_new_raidlist_entry(struct raidlist_itself *, 145 145 struct mountlist_itself *, int, char *); -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c
r2769 r2770 301 301 } 302 302 303 if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {303 if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, bkpinfo->subdir, nuke_me_please)) { 304 304 return (1); 305 305 } -
branches/2.2.9/mondo/src/mondorestore/mr-externs.h
r2394 r2770 32 32 extern void free_filelist(struct s_node *); 33 33 extern long get_time(void); 34 extern bool get_isodir_info(char *, char *, char *, bool);34 extern bool get_isodir_info(char *, char *, char *, char *, bool); 35 35 extern void fatal_error(char *); 36 36 extern void initialize_raid_record(struct raid_device_record *);
Note:
See TracChangeset
for help on using the changeset viewer.