Changeset 1873 in MondoRescue
- Timestamp:
- Jan 21, 2008, 7:16:46 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c
r1852 r1873 1468 1468 /** malloc *******/ 1469 1469 char *device; 1470 char *tmp ;1470 char *tmp = NULL; 1471 1471 char *name; 1472 1472 char *cmd = NULL; 1473 1473 1474 1474 malloc_string(device); 1475 malloc_string(tmp);1476 1475 malloc_string(name); 1477 1476 … … 1482 1481 asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING); 1483 1482 run_program_and_log_output(cmd, 3); 1483 paranoid_free(cmd); 1484 1484 1485 1485 backup_crucial_file(MNT_RESTORING, "/etc/fstab"); … … 1491 1491 read_cfg_var(g_mondo_cfg_file, "bootloader.device", device); 1492 1492 read_cfg_var(g_mondo_cfg_file, "bootloader.name", name); 1493 sprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);1493 asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name); 1494 1494 log_msg(2, tmp); 1495 paranoid_free(tmp); 1495 1496 system("sync"); 1496 1497 if (!strcmp(name, "LILO")) { … … 1505 1506 #ifdef __FreeBSD__ 1506 1507 else if (!strcmp(name, "BOOT0")) { 1507 sprintf(tmp, "boot0cfg -B %s", device);1508 asprintf(&tmp, "boot0cfg -B %s", device); 1508 1509 res = run_program_and_log_output(tmp, FALSE); 1510 paranoid_free(tmp); 1509 1511 } else { 1510 sprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);1512 asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device); 1511 1513 if (!system(tmp)) { 1512 sprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device); 1514 paranoid_free(tmp); 1515 asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device); 1513 1516 res = run_program_and_log_output(tmp, 3); 1514 1517 } else { … … 1516 1519 "I'm not running any boot loader. You have a DD boot drive. It's already loaded up."); 1517 1520 } 1521 paranoid_free(tmp); 1518 1522 } 1519 1523 #else … … 1531 1535 } 1532 1536 paranoid_free(device); 1533 paranoid_free(tmp);1534 1537 paranoid_free(name); 1535 1538 return (retval);
Note:
See TracChangeset
for help on using the changeset viewer.