Changeset 1691 in MondoRescue

Timestamp:

Oct 21, 2007, 2:27:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix PB macro vs tools/*2build issue
• make_usb_fs change of interface (doesn't need a parameter)
• Fix USB support in mondo to avoid multiple copies of files
• Use first partiion in mondo for USB device

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (5 diffs)
• mondo-doc/mindi.8 (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo-doc/mondorestore.8 (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (7 diffs)
• website/top.shtml (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -28 +28 @@
     # run this command.
 
-MINDI_REV=RRR
-MINDI_VER=VVV
+MINDI_REV=PBREV
+MINDI_VER=PBVER
 
 MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
@@ -1710 +1710 @@
     fi
     echo -en "."
+    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
+    umount $USBDEVICE 2>&1 >> $LOGFILE
     echo "Erasing $USBDEVICE" >> $LOGFILE
     $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
@@ -1752 +1754 @@
     fi
     echo -en "."
-    mkdir -p $MINDI_TMP/usb/{images,archives}
-    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
+    mkdir -p $MINDI_TMP/usb/images
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/usb/images"
     echo -en "."
     old_pwd=`pwd`
@@ -1777 +1779 @@
     cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
     echo -en "."
-    if [ _"$MONDO_SHARE" != _"" ]; then
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP) to mondo root ($MONDO_ROOT/initrd.img). Did you run out of disk space?"
-
-    fi
-    echo -en "."
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/usb > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to $MINDI_TMP/usb - did you run out of disk space?"
@@ -1793 +1789 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then
-            cp -f $MINDI_TMP/usb/{syslinux.cfg,initrd.img,vmlinuz,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
             cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
         fi

branches/2.2.5/mondo-doc/mindi.8

@@ -21 +21 @@
 .\" USA.
 .\"
-.TH MINDI 8 "DDD" "Mondo Rescue VVV-rRRR"
+.TH MINDI 8 "PBDATE" "Mondo Rescue PBVER-rPBREV"
 .SH NAME
 mindi \- a tool for creating boot/root disks

branches/2.2.5/mondo-doc/mondoarchive.8

@@ -19 +19 @@
 .\" USA.
 .\"
-.TH mondoarchive 8 "DDD" "Mondo Rescue VVV-rRRR"
+.TH mondoarchive 8 "PBDATE" "Mondo Rescue PBVER-rPBVER"
 
 .SH NAME

branches/2.2.5/mondo-doc/mondorescue-howto.sgml

@@ -1 +1 @@
 <!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY curdate "DDD">
-<!ENTITY curver "VVV-rRRR">
+<!ENTITY curdate "PBDATE">
+<!ENTITY curver "PBVER-rPBREV">
 
 <!ENTITY WWWB "http://www.mondorescue.org/">

branches/2.2.5/mondo-doc/mondorestore.8

@@ -19 +19 @@
 .\" USA.
 .\"
-.TH mondorestore 8 "DDD" "Mondo Rescue VVV-rRRR"
+.TH mondorestore 8 "PBDATE" "Mondo Rescue PBVER-rPBREV"
 
 .SH NAME

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -1857 +1857 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_usb_fs(char *destfile)
+int make_usb_fs()
 {
     /*@ int ********************************************** */
@@ -1872 +1872 @@
     malloc_string(old_pwd);
     assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(destfile);
-
-    log_msg(2, "make_usb_fs --- scratchdir=%s --- destfile=%s",
-            bkpinfo->scratchdir, destfile);
+
+    log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
     asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
@@ -1898 +1896 @@
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    asprintf(&tmp, "mount %s %s", bkpinfo->media_device, tmp1);
+    /* Mindi always create one single parition on the USB dev */
+    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1907 +1906 @@
         log_msg(1, "Making bootable backup");
 
-        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, tmp1); /* Command to execute */
+        /* Command to execute */
+        asprintf(&tmp,"mv %s/.??* %s/* %s", bkpinfo->scratchdir, bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
@@ -1923 +1923 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        asprintf(&tmp, "umount %s", bkpinfo->media_device);
+        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1935 +1935 @@
     return (retval);
 }
-
 
 
@@ -3937 +3936 @@
             res = make_iso_fs(isofile);
         } else {
-            res = make_usb_fs(isofile);
+            res = make_usb_fs();
         }
         if (g_current_media_number == 1 && !res

branches/2.2.5/website/top.shtml

@@ -15 +15 @@
       </div>
       <div id="topinfo">
-        VVV-rRRR   - DDD   </div>
+        PBVER-rPBREV   - PBDATE   </div>
     </div>
     <div id="body">