- Timestamp:
- Apr 14, 2008, 2:48:40 PM (16 years ago)
- Location:
- branches/2.2.6
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.6/mindi/mindi
r1912 r1913 65 65 PCMCIA_MODS="pcmcia_core ds yenta_socket" 66 66 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual" 67 CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_ cp437 nls_utf8 sg sr_mod zlib_inflate$USB_MODS $PCMCIA_MODS"67 CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 $USB_MODS $PCMCIA_MODS" 68 68 NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet" 69 69 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache" … … 2446 2446 if [ -e "$s" ] ; then 2447 2447 #cp --parents -af $s . 2>> $LOGFILE 2448 tar cf - $s | tar xf - 2> /dev/null2448 tar cf - $s 2> /dev/null | tar xf - 2449 2449 fi 2450 2450 done … … 2454 2454 2455 2455 # Handle the case where busybox and mount are dynamically linked 2456 # Should be done first so that if /lib64 is a link, it's2457 # created first like that, instead of as a real dir later on2458 2456 file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 2459 2457 if [ $? -eq 0 ]; then … … 2462 2460 LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis 2463 2461 #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` . 2464 tar cf - `sort -u $MINDI_TMP/busy.lis` | tar xf - 2> /dev/null2462 tar cf - $MINDI_LIB/rootfs/bin/busybox /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf - 2465 2463 rm -f $MINDI_TMP/busy.lis 2466 2464 fi … … 2472 2470 LogIt "udev device manager found" 2473 2471 #cp --parents -Rdf /etc/udev . 2> /dev/null 2474 tar cf - /etc/udev | tar xf - 2> /dev/null2472 tar cf - /etc/udev 2> /dev/null | tar xf - 2475 2473 # This avoids NIC remapping if on another machine at restore time on Debian at least 2476 2474 rm -f ./etc/udev/rules.d/z25_persistent-net.rules 2477 2475 #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null 2478 tar cf - /lib*/udev | tar xf - 2> /dev/null2476 tar cf - /lib*/udev 2> /dev/null | tar xf - 2479 2477 if [ -x /sbin/udevd ]; then 2480 2478 lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` … … 2503 2501 done 2504 2502 #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` . 2505 tar cf - $lis `sort -u $MINDI_TMP/udev.lis` | tar xf - 2> /dev/null2503 tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf - 2506 2504 rm -f $MINDI_TMP/udev.lis 2507 2505 else … … 2522 2520 LocateDeps $lis > $MINDI_TMP/tools.lis 2523 2521 #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` . 2524 tar cf - $lis `sort -u $MINDI_TMP/tools.lis` | tar xf - 2> /dev/null2522 tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf - 2525 2523 fi 2526 2524 if [ -f $MINDI_CACHE/mindi-rsthw ]; then … … 2542 2540 2543 2541 #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null 2544 tar cf - /dev/fd0*[1,2][4,7,8]* | tar xf - 2> /dev/null2542 tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf - 2545 2543 2546 2544 cd $old_pwd … … 2586 2584 echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE 2587 2585 #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint" 2588 tar cf - $i | (cd $mountpoint ; tar xf -) 2>/dev/null|| LogIt "Unable to copy $i to $mountpoint"2586 tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint" 2589 2587 # Uncompress modules if not useing udev and native modprobe 2590 2588 if [ ! -f $mountpoint/tmp/USE-UDEV ]; then … … 2598 2596 # Also copy modules.dep in case of udev so that normal modprobe works 2599 2597 #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint" 2600 tar cf - /$needed_modules_path/modules.dep | (cd $mountpoint ; tar xf -) 2>/dev/null|| LogIt "Unable to copy modules.dep to $mountpoint"2598 tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint" 2601 2599 2602 2600 # For all modules supported, create symlinks under the mountpoint … … 3073 3071 cd $MINDI_TMP/small-all 3074 3072 cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp 2>/dev/null || Die "Cannot copy small all.tar.gz" 3075 tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"3073 tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz" 3076 3074 sleep 2 3077 3075 LogIt "Done. Exiting." -
branches/2.2.6/mindi/mindi-bkphw
r1911 r1913 16 16 die "No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0])); 17 17 my $locbkpdir = "/bkphw"; 18 my $bkpdir = "$ARGV[0]$locb ckdir";18 my $bkpdir = "$ARGV[0]$locbkpdir"; 19 19 die "No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1])); 20 20 my $confdir = "$ARGV[1]"; -
branches/2.2.6/mondo/src/common/libmondo-stream.c
r1899 r1913 796 796 (void) getcwd(old_cwd, MAX_STR_LEN); 797 797 chdir(bkpinfo->tmpdir); 798 sprintf(tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",798 sprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null", 799 799 outfname); 800 800 paranoid_system(tmp); -
branches/2.2.6/mondo/src/common/my-stuff.h
r1885 r1913 215 215 * The biggielist stub (appended to the directory where all.tar.gz was unpacked). 216 216 */ 217 #define BIGGIELIST_TXT_STUB " tmp/biggielist.txt"217 #define BIGGIELIST_TXT_STUB "./tmp/biggielist.txt" 218 218 219 219 /** 220 220 * The filelist stub (appended to the directory where all.tar.gz was unpacked). 221 221 */ 222 #define FILELIST_FULL_STUB " tmp/filelist.full.gz"222 #define FILELIST_FULL_STUB "./tmp/filelist.full.gz" 223 223 224 224 /** 225 225 * The mountlist stub (appended to the directory where all.tar.gz was unpacked). 226 226 */ 227 #define MOUNTLIST_FNAME_STUB " tmp/mountlist.txt"227 #define MOUNTLIST_FNAME_STUB "./tmp/mountlist.txt" 228 228 229 229 /** 230 230 * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked). 231 231 */ 232 #define MONDO_CFG_FILE_STUB " tmp/mondo-restore.cfg"232 #define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg" 233 233 /** 234 234 * The location where mindi media images are stored. -
branches/2.2.6/mondo/src/mondorestore/mondo-restore.c
r1902 r1913 2777 2777 paranoid_fclose(fout); 2778 2778 sprintf(command, 2779 "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.fulltmp/biggielist.txt",2779 "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt", 2780 2780 datadisks_fname); 2781 2781 run_program_and_log_output(command, 4); -
branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c
r1909 r1913 1288 1288 BIGGIELIST_TXT_STUB, 1289 1289 FILELIST_FULL_STUB, 1290 " tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);1290 "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB); 1291 1291 log_msg(1, "tarcommand = %s", command); 1292 1292 run_program_and_log_output(command, 1); … … 1304 1304 BIGGIELIST_TXT_STUB, 1305 1305 FILELIST_FULL_STUB, 1306 " tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);1306 "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB); 1307 1307 1308 1308 log_msg(1, "tarcommand = %s", command); … … 1311 1311 if (!does_file_exist(BIGGIELIST_TXT_STUB)) { 1312 1312 fatal_error 1313 ("all.tar.gz did not include tmp/biggielist.txt");1313 ("all.tar.gz did not include ./tmp/biggielist.txt"); 1314 1314 } 1315 1315 if (!does_file_exist(FILELIST_FULL_STUB)) { 1316 1316 fatal_error 1317 ("all.tar.gz did not include tmp/filelist.full.gz");1317 ("all.tar.gz did not include ./tmp/filelist.full.gz"); 1318 1318 } 1319 1319 } … … 2278 2278 1024L * 1024 * 32 / tape_block_size, 2279 2279 MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, 2280 BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, " tmp/i-want-my-lvm");2280 BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm"); 2281 2281 log_msg(2, "command = '%s'", command); 2282 2282 res = run_program_and_log_output(command, -1); … … 2407 2407 log_msg(2, 2408 2408 "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz"); 2409 sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, " tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary2409 sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary 2410 2410 run_program_and_log_output(command, TRUE); 2411 2411 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
Note:
See TracChangeset
for help on using the changeset viewer.