Changeset 687 in MondoRescue for trunk/mondo/mondo/common/libmondo-tools.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-tools.c (modified) (4 diffs)

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

@@ -362 +362 @@
     assert(bkpinfo != NULL);
     bkpinfo->optimal_set_size =
-        (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 4 : 8) *
+        (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
         1024;
 
@@ -382 +382 @@
 
     run_program_and_log_output("uname -a", 5);
+    run_program_and_log_output("cat /etc/*-release", 5);
     run_program_and_log_output("cat /etc/*issue*", 5);
     asprintf(&g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
@@ -475 +476 @@
         paranoid_free(mondo_mkisofs_sz);
 
-        if (getenv("SUDO_COMMAND")) {
-            fatal_error
-                ("Can't write DVDs as sudo because growisofs doesn't support this - please see the growisofs manpage for details.");
+        if (getenv ("SUDO_COMMAND")) {
+            asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+            if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
+                popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+                fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
+            }       
+            paranoid_free(command);
         }
         log_msg(2, "call_make_iso (DVD res) is ... %s",
@@ -894 +899 @@
     // abort if Windows partition but no ms-sys and parted
     if (!run_program_and_log_output
-        ("mount | grep -w vfat | grep -v /dev/fd | grep -v nexdisk", 0)
+        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
         ||
         !run_program_and_log_output
-        ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
+        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         log_to_screen(_("I think you have a Windows 9x partition."));
         retval += whine_if_not_found("parted");