Changeset 2874 in MondoRescue
- Timestamp:
- Sep 29, 2011, 8:37:54 PM (13 years ago)
- Location:
- branches/2.2.10
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mindi/mindi
r2873 r2874 221 221 fi 222 222 223 # TODO: Why that 223 224 mkdir -p $bigdir/etc 225 # TODO: why not use the cp.lis here ? 224 226 tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log 225 227 if [ "`echo $mappath | grep -F ".gz"`" ] ; then … … 230 232 for included_item in $included_list ; do 231 233 if [ ! -e "$included_item" ] ; then 232 234 sss=`grep -F "${included_item}.inc" $MINDI_TMP/keymaps.find` 233 235 [ "$sss" = "" ] && sss=`grep -F "$included_item" $MINDI_TMP/keymaps.find` 234 236 for ii in $sss ; do … … 2240 2242 2241 2243 # Get kbd conf from data disk preparation 2242 echo$MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis2244 cat $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis 2243 2245 # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs 2244 2246 if [ -h "/lib64" ]; then … … 2281 2283 # and potentially their symlink structure and their deps 2282 2284 mountlis=`grep -Ev "^#" $MINDI_CONF/udev.files` 2285 if [ -x /etc/init.d/functions ]; then 2286 mountlis="$mountlis /etc/init.d/functions" 2287 fi 2283 2288 ReadAllLink $mountlis | sort -u >> $MINDI_TMP/udev.lis 2284 2289 LocateDeps `cat $MINDI_TMP/udev.lis` | sort -u >> $MINDI_TMP/cp.lis -
branches/2.2.10/mondo/src/common/libmondo-filelist.c
r2850 r2874 1347 1347 } 1348 1348 } 1349 mr_asprintf( &find_excludes, "|");1349 mr_asprintf(find_excludes, "|"); 1350 1350 1351 1351 if (!depth) { … … 1440 1440 } 1441 1441 mr_free(new_with_pipe); 1442 mr_asprintf(new_with_spaces, "|%s|", new);1443 1442 if (strstr(skip_these, new_with_pipe)) { 1444 1443 fprintf(fout, "%s\n", new); -
branches/2.2.10/mondo/src/common/newt-specific.c
r2816 r2874 1224 1224 newtComponent b2; 1225 1225 newtComponent b3; 1226 //newtComponent b4;1226 newtComponent b4; 1227 1227 newtComponent b5; 1228 1228 newtComponent b_res; … … 1236 1236 b2 = newtButton(18, 1, "gzip"); 1237 1237 b3 = newtButton(4, 5, "lzo"); 1238 //b4 = newtButton(18, 5, "lzma");1238 b4 = newtButton(18, 5, "lzma"); 1239 1239 b5 = newtButton(4, 9, " Exit "); 1240 1240 myForm = newtForm(NULL, NULL, 0); -
branches/2.2.10/mondo/src/mondorestore/mondorestore.c
r2850 r2874 838 838 "Using tune2fs to identify your ext2,3 partitions"); 839 839 840 mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);840 mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE); 841 841 res = run_program_and_log_output(tmp, TRUE); 842 842 mr_free(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.