Changeset 145 in MondoRescue for trunk

Timestamp:

Nov 29, 2005, 4:16:36 PM (18 years ago)

Author:

bcornec

Message:

merge -r141:144 $SVN_M/branches/2.05

Location:

trunk/mondo/mondo/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-files.c (modified) (1 diff)

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

@@ -3633 +3633 @@
             }
         }
-/*
-      sprintf (tmp,
-           "cat %s | grep \"afio: \" | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -vx \"/afio:.*\" > /tmp/changed.files",
-           MONDO_LOGFILE);
-      system (tmp);
-*/
         asprintf(&tmp,
-                 "sed -n -e 's/afio: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
+                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
@@ -3646 +3640 @@
 
         asprintf(&tmp,
-                 "sed -n -e 's/star: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
+                 "grep 'star: ' %s | sed 's/star: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);

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

@@ -1233 +1233 @@
     }
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s # config client\n", nfs_dev,
+    fprintf(fout, "ifconfig %s %s   # config client\n", nfs_dev,
             nfs_client_ipaddr);
-    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
+    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
             bkpinfo->nfs_mount);