Changeset 848 in MondoRescue for trunk/mondo

Timestamp:

Sep 27, 2006, 1:20:34 AM (19 years ago)

Author:

Bruno Cornec

Message:

Fix compiles issues

File:

• trunk/mondo/src/common/libmondo-filelist.c (modified) (1 diff)

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

@@ -1365 +1365 @@
         asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
-             dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+             dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
->>>>>>> .merge-right.r838
+                dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
 #endif
         paranoid_free(find_excludes);