Changeset 454 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Mar 24, 2006, 7:09:44 PM (18 years ago)

Author:

bcornec

Message:

deplist.d introduced
deplist.txt split in multiple config files under it
delivery process adapted

File:

• branches/stable/mindi/mindi (modified) (7 diffs)

branches/stable/mindi/mindi

@@ -64 +64 @@
 
 if [ "$mindi_deplist_dir" == "" ]; then
-    DEPLIST_DIR="/etc/mindi/deplist.d"
+    DEPLIST_DIR="$MINDI_CONF/deplist.d"
 else
     DEPLIST_DIR="$mindi_deplist_dir"
@@ -328 +328 @@
     biggienumber=$4
 
-    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist.txt accordingly."
+    [ -d "$filename" ] && Die "Cannot chop up $filename: it's a directory. Please amend deplist file accordingly."
     mkdir -p $outdir
 
@@ -875 +875 @@
     echo "$fname" >> $outfile.pre
         cat $tempdepfile >> $outfile.pre
-#        echo "$fname ----> dependencies:-" >> $LOGFILE
-#        cat $tempdepfile | tr -s '/' '/' | sort -u >> $LOGFILE
-#        echo -en "(end of deplist of $fname)\n\n" >> $LOGFILE
         rm -f $tempdepfile
     progress=$(($progress+1))
@@ -1364 +1361 @@
     if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
     echo -en "\rAnalyzing LVM...\r"
-    all_partitions=`$MINDI_LIB/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
+    all_partitions=`$MINDI_SBIN/analyze-my-lvm | fgrep ">>>" | cut -d' ' -f2-32`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2169 +2166 @@
     tardir=$TMP_ROOT/tardir
 
-    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt | grep -vx "" | wc -l`
-    cat $MINDI_CONF/deplist.txt | GenerateGiantDependencyList $needlist $lines
+    lines=`grep -vx " *#.*" $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | grep -vx "" | wc -l`
+    cat $MINDI_CONF/deplist.txt $DEPLIST_DIR/* | GenerateGiantDependencyList $needlist $lines
     res=$?
     if [ "$YOUR_KERNEL_SUCKS" ]; then
@@ -2270 +2267 @@
     cp -f $TMP_ROOT/mountlist.txt $CACHE_LOC
     [ "`DidMondoCallMe`" ] && cp -f $minidir_root/$noof_disks/tmp/mountlist.txt $MONDO_TMP/.
-    [ -d "/proc/lvm" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
-    [ -d "/dev/mapper" ] && $MINDI_LIB/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/proc/lvm" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
+    [ -d "/dev/mapper" ] && $MINDI_SBIN/analyze-my-lvm > $minidir_root/$noof_disks/tmp/i-want-my-lvm
     cat $minidir_root/$noof_disks/tmp/mountlist.txt >> $LOGFILE
     ZipMinidirsIntoTarballs $minidir_root $tardir $noof_disks
@@ -2954 +2951 @@
 #----------------------------------- main -----------------------------------#
 ##############################################################################
-
-
-#AWK=`which gawk`
-#LocateDeps $1
-#MakeModuleLoadingScript /tmp/load-modules.sh
-#exit 0
-
-
-#cat /etc/mindi/deplist.txt | GenerateGiantDependencyList /tmp/deplist.old 200
-#exit 0
-