Changeset 729 in MondoRescue for trunk/mondo

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• ChangeLog (modified) (1 diff)
• distributions/mandriva/spec.m4 (modified) (2 diffs)
• distributions/redhat/spec.m4 (modified) (1 diff)
• distributions/rpm/mondo.spec (modified) (5 diffs)
• distributions/suse/spec.m4 (modified) (2 diffs)
• mondo/Makefile.am (modified) (1 diff)
• mondo/common/libmondo-archive.c (modified) (1 diff)
• mondo/common/libmondo-devices.c (modified) (3 diffs)
• mondo/common/libmondo-filelist.c (modified) (1 diff)
• mondo/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/mondorestore/mondo-rstr-tools.c (modified) (6 diffs)
• mondo/restore-scripts/mondo/grub-install.patched (modified) (1 diff)
• mondo/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

trunk/mondo/ChangeLog

@@ -3 +3 @@
 MONDO CHANGES
 
-2.2.0-1 (2006-06-12) 
+2.3.0 (2006-07-30) 
 - indent on source files
 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec)
 - Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
 
-2.0.9 (2006-06-26)
+2.0.9 (2006-07-30)
+- Fix various screen corruption for 'Configure LVM'/RAID sync (Andree Leidenfrost)
+- SuSE RPMS now use bzip2 (Lars Rupp/Bruno Cornec)
+- Exclude mvfs type of filesystem (ClearCase) from mondo backup (Bruno Cornec)
+- Improved .spec Requires (Fedora/SuSE feedbacks) (Bruno Cornec)
 - nfsmount option added to allow redeployment from another NFS server (Bruno Cornec)
 - Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost)

trunk/mondo/distributions/mandriva/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', )dnl
@@ -8 +8 @@
 define(`GRP', `Archiving/Backup')dnl
 dnl OBS is replaced with what is being obsoleted
-define(`OBS', `Obsoletes:   libmondo <= 2.04
+define(`OBS', `Obsoletes:   libmondo
 Provides:   libmondo')dnl

trunk/mondo/distributions/redhat/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', )dnl

trunk/mondo/distributions/rpm/mondo.spec

@@ -3 +3 @@
 #
 
-%define mrel    RRR
-%define tag     TTT
-# if mandriva official build (rpm --with is_official)
-%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
-%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
+%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -16 +12 @@
 Name:       mondo
 Version:    VVV
-Release:    %{mrel}
+Release:    RRR
 License:    GPL
 Group:      GRP
@@ -22 +18 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
+BuildRequires:  newt-devel >= 0.50, gcc
 OBS
 %ifarch ia64
@@ -59 +55 @@
 
 %prep
-%setup -q -n %name-%{version}-%{tag}
+%setup -q -n %name-%{version}
 
 %build
@@ -76 +72 @@
 
 %files
+%defattr(-,root,root)
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS

trunk/mondo/distributions/suse/spec.m4

@@ -2 +2 @@
 dnl
 dnl SSS is replaced by the source package format
-define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
+define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
 dnl DDD is replaced by the list of dependencies specific to that distro
 define(`DDD', `, buffer, cdrecord')dnl
@@ -8 +8 @@
 define(`GRP', `Productivity/Archiving/Backup')dnl
 dnl OBS is replaced vy what is being obsoleted
-define(`OBS', )dnl
+define(`OBS', `Obsoletes: mondo <= 2.06')dnl

trunk/mondo/mondo/Makefile.am

@@ -2 +2 @@
 DIST_SUBDIRS   = ${SUBDIRS}
 
-pkgdata_DATA   = do-not-compress-these autorun
+pkgdata_DATA   = do-not-compress-these
+scriptdir      = $(pkgdatadir)
+script_DATA    = autorun
+
+install-data-hook:
+    @for prog in $(script_DATA); do \
+      chmod +x $(scriptdir)/$$prog; \
+    done

trunk/mondo/mondo/common/libmondo-archive.c

@@ -3076 +3076 @@
     } else {
         file_to_openin = biggie_filename;
-        asprintf(&command, "md5sum '%s'", biggie_filename);
+        if (strchr(biggie_filename,'\'') != NULL) {
+            asprintf(&command, "md5sum \"%s\"", biggie_filename);
+        } else {
+            asprintf(&command, "md5sum '%s'", biggie_filename);
+        }
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1575 +1575 @@
             if (bkpinfo->media_device != NULL) {
                 asprintf(&tmp,
-                        _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
+                        _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),
@@ -2021 +2021 @@
 {
     return(call_program_and_get_last_line_of_output
-           ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     /* BERLIOS : Useless
     asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
            */
 }
@@ -2072 +2072 @@
 #ifdef __FreeBSD__
     tmp = call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
+           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
 #else
     tmp = call_program_and_get_last_line_of_output
-           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
+           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
 #endif
 

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -1355 +1355 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&tmp,
-                 "find %s -maxdepth %d -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&tmp,
-                 "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
 #endif
         system(tmp);

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -234 +234 @@
     asprintf(&command,
             "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
-            MONDO_LOGFILE "; done; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);
+            MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz);
     paranoid_free(vgchange_sz);
     paranoid_free(vgremove_sz);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -1352 +1352 @@
     paranoid_free(format_str);
 
-    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
-        || !strcmp(mountlist->el[currline].mountpoint, "image")) {
-        mountlist->el[currline].size =
-            calculate_raid_device_size(mountlist, raidlist,
+    if (strcmp(mountlist->el[currline].mountpoint, "image")) {
+        if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
+            mountlist->el[currline].size =
+                calculate_raid_device_size(mountlist, raidlist,
                                        mountlist->el[currline].device);
-    } else {
-        mountlist->el[currline].size = atol(size_str) * 1024;
+        } else {
+            mountlist->el[currline].size = atol(size_str) * 1024;
+        }
     }
     paranoid_free(size_str);

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -320 +320 @@
             asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
         }
-        run_program_and_log_output("df -P -m", FALSE);
+        run_program_and_log_output("df -m", FALSE);
         asprintf(&tmp,
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
@@ -445 +445 @@
     }
     close_progress_form();
-    run_program_and_log_output("df -P -m", TRUE);
+    run_program_and_log_output("df -m", TRUE);
     if (retval) {
         if (g_partition_table_locked_up > 0) {
@@ -476 +476 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
-    run_program_and_log_output("df -P -m", 3);
+    run_program_and_log_output("df -m", 3);
     paranoid_free(mountlist);
     return (retval);
@@ -766 +766 @@
                                FALSE);
     run_program_and_log_output("cd " MNT_RESTORING
-                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",
+                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
                                TRUE);
     run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
@@ -1971 +1971 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -P -m", 3);
+    run_program_and_log_output("df -m", 3);
     mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
     open_progress_form(_("Unmounting devices"),
@@ -2400 +2400 @@
                 paranoid_free(screen_message);
 
-                if (raidlist->el[i].progress == -1) // delayed while another partition inits
-                {
+                if (raidlist->el[i].progress == -1) { // delayed while another partition inits
                     continue;
                 }

trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched

@@ -257 +257 @@
     # For now, this uses the program `df' to get the device name, but is
     # this really portable?
-    tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^    ]*\).*%\1%p'`
+    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^   ]*\).*%\1%p'`
 
     if test -z "$tmp_fname"; then

trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

@@ -59 +59 @@
 while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
     if [ "$line" = "" ] ; then
-    noof_blank_lines=$(($noof_blank_lines+1))
+        noof_blank_lines=$(($noof_blank_lines+1))
     else
-    noof_blank_lines=0
-    read_partition_line "$line"
+        noof_blank_lines=0
+        read_partition_line "$line"
     fi
     read line