Changeset 687 in MondoRescue for trunk/mondo/mondo/common/libmondo-devices.c

Timestamp:

Jul 17, 2006, 3:39:42 PM (18 years ago)

Author:

bcornec

Message:

merge -r671:686 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-devices.c (modified) (3 diffs)

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

@@ -304 +304 @@
     return
         !system
-        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | egrep -qv '(MS|DOS|FAT|NTFS)'");
+        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|FAT|NTFS)'");
 #endif
 }
@@ -1465 +1465 @@
     case dvd:
         if (archiving_to_media) {
-            if (ask_me_yes_or_no
-                (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
-            {
-                bkpinfo->manual_cd_tray = TRUE;
+            if (bkpinfo->backup_media_type != dvd) {
+                if (ask_me_yes_or_no
+                    (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
+                {
+                    bkpinfo->manual_cd_tray = TRUE;
+                }
             }
             if ((bkpinfo->compression_level =
@@ -2065 +2067 @@
     asprintf(&tmp,
            call_program_and_get_last_line_of_output
-           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -v none | grep -v 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 | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
     asprintf(&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 -v none | grep -v Filesystem | grep -v /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 | 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