Changeset 1913 in MondoRescue for branches/2.2.6

Timestamp:

Apr 14, 2008, 2:48:40 PM (16 years ago)

Author:

Bruno Cornec

Message:

Extract of mandatory files is now under ./tmp/.. instead of tmp/.. as we now use ar to create the all.tar.gz

Location:

branches/2.2.6

Files:

• mindi/mindi (modified) (11 diffs)
• mindi/mindi-bkphw (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)
• mondo/src/common/my-stuff.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (5 diffs)

branches/2.2.6/mindi/mindi

@@ -65 +65 @@
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 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"
-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"
+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"
 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"
 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
             #cp --parents -af $s . 2>> $LOGFILE
-            tar cf - $s | tar xf - 2> /dev/null
+            tar cf - $s 2> /dev/null | tar xf -
         fi
     done
@@ -2454 +2454 @@
 
     # Handle the case where busybox and mount are dynamically linked
-    # Should be done first so that if /lib64 is a link, it's
-    # created first like that, instead of as a real dir later on
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
@@ -2462 +2460 @@
         LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
         #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        tar cf - `sort -u $MINDI_TMP/busy.lis` | tar xf - 2> /dev/null
+        tar cf - $MINDI_LIB/rootfs/bin/busybox /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2472 +2470 @@
         LogIt "udev device manager found"
         #cp --parents -Rdf /etc/udev . 2> /dev/null
-        tar cf - /etc/udev | tar xf - 2> /dev/null
+        tar cf - /etc/udev 2> /dev/null | tar xf -
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z25_persistent-net.rules
         #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
-        tar cf - /lib*/udev | tar xf - 2> /dev/null
+        tar cf - /lib*/udev 2> /dev/null | tar xf -
         if [ -x /sbin/udevd ]; then
             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
@@ -2503 +2501 @@
             done
             #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
-            tar cf - $lis `sort -u $MINDI_TMP/udev.lis` | tar xf - 2> /dev/null
+            tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf -
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2522 +2520 @@
             LocateDeps $lis > $MINDI_TMP/tools.lis
             #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
-            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` | tar xf - 2> /dev/null
+            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf -
         fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
@@ -2542 +2540 @@
 
     #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
-    tar cf - /dev/fd0*[1,2][4,7,8]* | tar xf - 2> /dev/null
+    tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf -
 
     cd $old_pwd
@@ -2586 +2584 @@
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
         #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
-        tar cf - $i | (cd $mountpoint ; tar xf -) 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
+        tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
         # Uncompress modules if not useing udev and native modprobe
         if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
@@ -2598 +2596 @@
     # Also copy modules.dep in case of udev so that normal modprobe works
     #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
-    tar cf - /$needed_modules_path/modules.dep | (cd $mountpoint ; tar xf -) 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+    tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
 
     # For all modules supported, create symlinks under the mountpoint
@@ -3073 +3071 @@
     cd $MINDI_TMP/small-all
     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"
-    tar -cv tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
+    tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz || Die "Cannot make small all.tar.gz"
     sleep 2
     LogIt "Done. Exiting."

branches/2.2.6/mindi/mindi-bkphw

@@ -16 +16 @@
 die "No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
 my $locbkpdir = "/bkphw";
-my $bkpdir = "$ARGV[0]$locbckdir";
+my $bkpdir = "$ARGV[0]$locbkpdir";
 die "No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1]));
 my $confdir = "$ARGV[1]";

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -796 +796 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    sprintf(tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
+    sprintf(tmp, "tar -zxf %s ./tmp/mondo-restore.cfg 2> /dev/null",
             outfname);
     paranoid_system(tmp);

branches/2.2.6/mondo/src/common/my-stuff.h

@@ -215 +215 @@
  * The biggielist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define BIGGIELIST_TXT_STUB "tmp/biggielist.txt"
+#define BIGGIELIST_TXT_STUB "./tmp/biggielist.txt"
 
 /**
  * The filelist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define FILELIST_FULL_STUB "tmp/filelist.full.gz"
+#define FILELIST_FULL_STUB "./tmp/filelist.full.gz"
 
 /**
  * The mountlist stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
+#define MOUNTLIST_FNAME_STUB "./tmp/mountlist.txt"
 
 /**
  * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
  */
-#define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
+#define MONDO_CFG_FILE_STUB "./tmp/mondo-restore.cfg"
 /**
  * The location where mindi media images are stored.

branches/2.2.6/mondo/src/mondorestore/mondo-restore.c

@@ -2777 +2777 @@
     paranoid_fclose(fout);
     sprintf(command,
-            "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
+            "tar -zxvf %s ./tmp/mondo-restore.cfg ./tmp/mountlist.txt ./tmp/filelist.full ./tmp/biggielist.txt",
             datadisks_fname);
     run_program_and_log_output(command, 4);

branches/2.2.6/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1288 +1288 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+            "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
     log_msg(1, "tarcommand = %s", command);
     run_program_and_log_output(command, 1);
@@ -1304 +1304 @@
             BIGGIELIST_TXT_STUB,
             FILELIST_FULL_STUB,
-            "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+            "./tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
 
     log_msg(1, "tarcommand = %s", command);
@@ -1311 +1311 @@
     if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
         fatal_error
-            ("all.tar.gz did not include tmp/biggielist.txt");
+            ("all.tar.gz did not include ./tmp/biggielist.txt");
     }
     if (!does_file_exist(FILELIST_FULL_STUB)) {
         fatal_error
-            ("all.tar.gz did not include tmp/filelist.full.gz");
+            ("all.tar.gz did not include ./tmp/filelist.full.gz");
     }
 }
@@ -2278 +2278 @@
             1024L * 1024 * 32 / tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
+            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "./tmp/i-want-my-lvm");
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2407 +2407 @@
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                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
+                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
                 run_program_and_log_output(command, TRUE);
                 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {