Changeset 3801 in MondoRescue for branches

Timestamp:

Feb 16, 2024, 12:43:53 AM (15 months ago)

Author:

Bruno Cornec

Message:

Hopefully improve again commit hook

Location:

branches/3.3

Files:

• MondoRescue/lib/MondoRescue/File.pm (modified) (2 diffs)
• MondoRescue/t/01-read-all-link.t (modified) (4 diffs)
• ansible/roles/trac/tasks/main.yml (modified) (1 diff)
• ansible/roles/trac/templates/trac.ini (modified) (1 diff)
• mindi/mindi (modified) (13 diffs)

branches/3.3/MondoRescue/lib/MondoRescue/File.pm

@@ -156 +156 @@
         if (defined $link) {
             $link = mr_file_normalize($link,"$curdir/$dir");
-            # It's a real symlink on a file so handle it
-            $files->{$f}->{"$curdir/$dir"} = 1 if ((not -d $link) && (not -d "/$link"));
+            # It's a real symlink so handle it
+            $files->{$f}->{"$curdir/$dir"} = 1;
             if (substr($link,0,1) eq "/") {
                 $curdir = $link;
@@ -170 +170 @@
                 foreach my $k (keys %$h) {
                     foreach my $l (keys %$k) {
-                        # Use $f as key as we affect all the files 
+                        # Use $f as key as we affects all the files 
                         # found in recursion to the current managed file
                         $files->{$f}->{$l} = 1;

branches/3.3/MondoRescue/t/01-read-all-link.t

@@ -7 +7 @@
 # Create the structure for the tests
 my $bd = tempdir( 
-    #CLEANUP => 1 
+    CLEANUP => 1 
     );
 
@@ -23 +23 @@
 copy "/usr/bin/perl","usr/bin" || die "$!";
 chmod 0755,"usr/bin/perl";
+my $libc;
 foreach my $f (<"/lib/libc.so.[0-9]*">) {
     copy "$f","usr/lib" || die "$!";
+    $libc = $f;
 }
 
@@ -55 +57 @@
     );
 
-eval {
-    require Test;
-    Test->import();
+my $more = 1;
+
+eval
+{
+        require Test::More;
+        Test::More->import();
+        no_plan();
 };
+# Test::More not found so simpler test
 if ($@) {
-        require Test::Simple;
-    Test::Simple->import();
+    $more = 0;
+    eval {
+        require Test;
+        Test->import();
+    };
+    if ($@) {
+        require Test::Simple;
+        Test::Simple->import();
+    }
 }
 plan(tests => 12);
@@ -83 +97 @@
 sub myis {
 
-my $p1 = shift;
-my $p2 = shift;
-my $p3 = shift;
-print "# test $p3\n";
-return(ok($p1,$p2));
+if ($more eq 1) {
+    return(is(@_));
+} else {
+    my $p1 = shift;
+    my $p2 = shift;
+    my $p3 = shift;
+    print "# test $p3\n";
+    return(ok($p1,$p2));
 }
+}
+

branches/3.3/ansible/roles/trac/tasks/main.yml

@@ -37 +37 @@
 
 - name: Configure svn post-commit hook
-  lineinfile: path="/prj/svn/{{ item }}/hooks/post-commit" state=present line='/prj/trac/trac-svn-hook $1 $2' owner=bruno group=bruno mode=0755 backup=yes create=true
+  lineinfile: path="/prj/svn/{{ item }}/hooks/post-commit" state=present line='/prj/trac/trac-svn-hook $1 $2 $3 $4' owner=bruno group=bruno mode=0755 backup=yes create=true
   loop: "{{ prj }}"
 

branches/3.3/ansible/roles/trac/templates/trac.ini

@@ -76 +76 @@
 tracopt.versioncontrol.git.* = enabled
 tracopt.versioncontrol.svn.* = enabled
+trac.versioncontrol.api.repositorymanager = enabled
+trac.versioncontrol.svn_authz.svnauthzoptions = enabled
+trac.versioncontrol.svn_fs.subversionconnector = enabled
+trac.versioncontrol.svn_prop.subversionmergepropertydiffrenderer = enabled
+trac.versioncontrol.svn_prop.subversionmergepropertyrenderer = enabled
+trac.versioncontrol.svn_prop.subversionpropertyrenderer = enabled
 tracspamfilter.* = enabled
 trac.web.auth.loginmodule = disabled

branches/3.3/mindi/mindi

@@ -302 +302 @@
     local outdir incoming counter d found tdir templog
     outdir=$1
-    noof_lines=$2
-    counter=$3
     templog=$MINDI_TMP/$$.log
     mkdir -p $outdir
     incoming=`ReadLine`
+    counter=$3
     > $templog
 
     while [ "$incoming" != "" ] ; do
-        LogFile "DEBUG: Handling $incoming"
-        if [ "$noof_lines" != "0" ]; then
+        if [ "$3" = "1" ]; then
             counter=$(($counter+1))
-            LogProgress $counter $noof_lines
+            LogProgress $counter $2
         fi
         # Non absolute file names should not arrive till here => skipped
         if [ `echo "$incoming" | cut -c1` != '/' ]; then
-            LogAll "WARNING: Unable to handle $incoming"
+            LogFile "WARNING: Unable to handle non-full pathname $incoming"
             incoming=`ReadLine`
             continue
         fi
-        if [ -e "$incoming" ]; then
-            LogFile "DEBUG: Adding $incoming"
-            listfile="$listfile $incoming"
-        fi
-        incoming=`ReadLine`
-    done
-
-    LogAll "Creating mindi tar file"
-    tar cf - -C / $listfile 2> $templog | (cd "$outdir" ; tar xf -) # || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $templog
-}
-
-bidon() {
-
         # no parent directory of incoming should be a link, copy is not possible in that case
         d=`dirname "$incoming"`
         found="false"
         while [ $d != "/" -a $found = "false" ]; do
-            if [ -h "$d" ]; then
-                found="true"
-                LogFile "WARNING: skipping $d as link"
-                incoming=`ReadLine`
-                continue
-            fi
+            [ -h "$d" ] && found="true"
             d=`dirname "$d"`
         done
-
         if [ -d "$incoming" -a ! -h "$incoming" ]; then
-            LogFile "DEBUG: Finding in $incoming"
-            find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0 0
+            find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0 0
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
             if [ ! -h "$incoming" ]; then
-                LogFile "DEBUG: Tarring $incoming"
                 tar cf - -C / $incoming 2> $templog | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $templog
             else
-                LogFile "DEBUG: Copying $incoming"
                 tdir=`dirname "$incoming"`
                 if [ ! -e "$outdir/$tdir" ]; then
@@ -364 +340 @@
             # Only uncompress modules if not using udevd
             if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
-                    gunzip -f $outdir/$incoming || LogAll "WARNING: Cannot gunzip $outdir/$incoming"
+                gunzip -f $outdir/$incoming || LogAll "WARNING: Cannot gunzip $outdir/$incoming"
             fi
             [ -x "$outdir" ] && StripExecutable $outdir
         fi
         incoming=`ReadLine`
+    done
 }
 
@@ -379 +356 @@
     done
     echo $r
+}
+
+
+DropOptimizedLibraries() {
+    local outdir filelist list_of_optimized_libraries optimized_lib_name vanilla_lib_name reason msg resolved res
+    filelist=$1
+    outdir=$2
+
+    list_of_optimized_libraries=`grep "lib/i[5-7]86/" $filelist`
+    if [ "$list_of_optimized_libraries" = "" ] ; then
+        return 0
+    fi
+    echo -en "Dropping i686-optimized libraries if appropriate"
+    for optimized_lib_name in $list_of_optimized_libraries ; do
+        echo -en "."
+        reason=""
+        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
+        echo "$vanilla_lib_name" >> $filelist
+        LogFile "INFO: Adding $vanilla_lib_name to filelist"
+        mkdir -p $outdir$optimized_lib_name > /dev/null 2> /dev/null
+        rmdir $outdir$optimized_lib_name > /dev/null 2> /dev/null
+
+        # This may return multiple files
+        for resolved in `mr-read-all-link $vanilla_lib_name`; do
+            LogFile "INFO: Adding as deps $resolved to filelist"
+            vanilla_resolved_name=`echo "$resolved" | sed -e 's/i[5-7]86//' -e 's/cmov//' -e 's/nosegneg//' | tr -s '/' '/'`
+            if [ "$vanilla_resolved_name" != "$resolved" ]; then
+                mkdir -p $outdir$resolved> /dev/null 2> /dev/null
+                rmdir $outdir$resolved > /dev/null 2> /dev/null
+                ln -sf $vanilla_resolved_name $outdir$resolved
+                LogFile "INFO: Excluding deps $resolved"
+                grep -Fvx "$resolved" "$filelist" > $filelist.tmp
+                LogFile "INFO: Replacing it with $vanilla_resolved_name"
+                echo "$vanilla_resolved_name" >> $filelist.tmp
+                mv -f $filelist.tmp $filelist
+            fi
+        done
+    done
+    $AWK '{ print $1; }' $filelist | sort -u > $filelist.tmp
+    mv -f $filelist.tmp $filelist
+    echo -e "$DONE"
 }
 
@@ -2332 +2350 @@
 
 PrepareBigDir() {
-    local needlist diskdir res i j k lines lfiles includefile ti templog
+    local needlist diskdir res i j k lines lfiles includefile ti
 
     rm -f $MINDI_CACHE/mindi.iso
-    mkdir -p $targetdir
-    templog=$MINDI_TMP/$$.log
-    needlist=$MINDI_TMP/kernel-modules.conf
-    mkdir -p $bigdir/usr/bin $bigdir/usr/sbin $bigdir/tmp
-    # Generated file
-    includefile=$MINDI_TMP/include-modules.conf
-
-    lfiles=`ls $DEPLIST_DIR/* | grep -Ev '/minimal|/udev|/drbd'`
+    needlist=$MINDI_TMP/what-we-need.txt
+    mkdir -p $bigdir/usr/bin
+    mkdir -p $bigdir/usr/sbin
+    includefile=$MINDI_TMP/$$.includefile.txt
+
+    lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
     if [ -e "$DEPLIST_FILE" ]; then
         lfiles="$DEPLIST_FILE $lfiles"
     fi
+    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     ParseModprobeForIncludes $includefile
-    ListKernelModulePaths > $needlist
-    for f in $lfiles $includefile $needlist; do
-        CopyFromConf $f $targetdir
-    done
+    lines=$(($lines+`cat $includefile | wc -l`))
+    cat $lfiles $includefile | GenerateGiantDependencyList $needlist $lines
+    res=$?
     rm -f $includefile
-
+    ListKernelModulePaths >> $needlist
+    if [ "$res" -ne "0" ] ; then
+        Die "You have $res files present in dependency list\nbut absent from filesystem."
+    fi
+    mkdir -p $bigdir/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
         # TODO: no reason to have the cfg file stored twice
@@ -2363 +2383 @@
 
     [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
+    DropOptimizedLibraries $needlist $bigdir
+    echo -en "INFO: Assembling dependency files"
+
+    CopyDependenciesToDirectory < $needlist $bigdir `wc -l $needlist` 1
+    rm -f $needlist
+    echo -e "$DONE"
 
     # also copy io.sys and msdos.sys, if we can find them
@@ -2393 +2419 @@
     done
     if [ -e "$MONDO_SHARE/restore-scripts" ]; then
-        mkdir -p $bigdir/usr/bin $bigdir/etc
         cp -Rdf $MONDO_SHARE/restore-scripts/mondo/* $bigdir/usr/bin 2>> $LOGFILE
         [ $? -ne 0 ] && [ _"$MONDO_SHARE" != _"" ] && Die "Cannot find/install $MONDO_SHARE/restore-scripts"
@@ -2448 +2473 @@
     PrepareBootDir
 
-    LogFile "---------------------------"
-    LogFile "Content of initial bigdir:"
-    LogFile "---------------------------- "
-    (cd "$bigdir" ; ls -Rla ) >> $LOGFILE
-    LogFile "---------------------------"
 }
 
@@ -2694 +2714 @@
     conf=$1
     mp=$2
-    if [ ! -e $conf ]; then
-        # Invoked with a conf file short name fixing...
-        conf="$DEPLIST_DIR/$1.conf"
-    fi
-    if [ ! -e $conf ]; then
-        LogAll "Unable to find conf file $conf please report upstream"
-        return
-    fi
-    bconf=`basename $conf .conf`
-    echo -en "INFO: Gathering dependencies of $bconf..."
-    LogFile "INFO: Gathering dependencies of $conf..."
-    lis2=`grep -Ev '^#' $conf | sort -u`
+    echo -en "INFO: Gathering dependencies of $conf.conf..."
+    LogFile "INFO: Gathering dependencies of $conf.conf..."
+    lis2=`grep -Ev '^#' $DEPLIST_DIR/$conf.conf | sort -u`
     noof_lines=`echo $lis2 | wc -w`
     progress=0
-    LogFile "DEBUG: targetdir: `ls -l $mp/`"
-    LogFile "DEBUG: lis2=$lis2"
     # Get only the files which exist in that list
     # and potentially their symlink structure
     # put apart directories for later handling
-    touch $MINDI_TMP/$bconf.lis $MINDI_TMP/$bconf.lis2
     for f in $lis2; do
         if [ -d $f ]; then
             for g in `find $f`; do
-                echo $g >> $MINDI_TMP/$bconf.lis
-                LocateDeps $g  >> $MINDI_TMP/$bconf.lis2
+                echo $g >> $MINDI_TMP/$conf.lis
+                LocateDeps $g  >> $MINDI_TMP/$conf.lis2
             done
             lis3="$lis3 $f"
         else
             if [ -r $f ]; then
-                echo $f >> $MINDI_TMP/$bconf.lis
-                LocateDeps $f >> $MINDI_TMP/$bconf.lis2
+                echo $f >> $MINDI_TMP/$conf.lis
+                LocateDeps $f >> $MINDI_TMP/$conf.lis2
             fi
         fi
@@ -2730 +2738 @@
         LogProgress $progress $noof_lines
     done
-    LogFile "DEBUG: lis3=$lis3"
-    #LogAll "INFO: Processing all dependencies links for $conf..."
+    echo -e "$DONE"
+    LogAll "INFO: Processing all dependencies links for $conf.conf..."
     # And their deps except dirs
-    lines=`sort -u $MINDI_TMP/$bconf.lis $MINDI_TMP/$bconf.lis2`
-    rm -f $MINDI_TMP/$bconf.lis2
+    lines=`sort -u $MINDI_TMP/$conf.lis $MINDI_TMP/$conf.lis2`
+    rm -f $MINDI_TMP/$conf.lis2
     finallist=""
     # Remove directories from the list, as cp will create them anyway
@@ -2740 +2748 @@
     # recent bash says that -d is true for a link to a dir !
     for f in $lines; do
-        LogFile "DEBUG: f=$f"
         if [ -e "$f" -a ! -d "$f" ] || [ -h "$f" ]; then
-            LogFile "DEBUG: Test OK"
             # Do not overwrite files already in destination (avoid using option -n of cp not portable)
             if [ ! -e "$mp/$f" ]; then
                 finallist="$finallist $f"
-                LogFile "DEBUG: Creating $mp/$f"
-            else
-                LogFile "DEBUG: Target exist `ls -al $mp/$f`"
             fi
         fi
     done
-    LogFile "DEBUG: finallist=$finallist"
     # But adds the directory useful in $lis3
     fnllist=`echo $finallist $lis3 | tr ' ' '\n' | sort -u | tr '\n' ' '`
-    echo -e "$DONE"
-    if [ _"$fnllist" != _"" ] && [ _"$fnllist" != _" " ]; then
-        LogFile "INFO: Copying $conf related files with cp -a --parents $fnllist -t $mp/"
-        cp -a --parents $fnllist -t $mp/ 2>$templog  || LogAll "WARNING: Problem in $conf analysis" $templog
-    fi
-    rm -f $MINDI_TMP/$bconf.lis
+    LogFile "INFO: Copying $conf related files with cp -a --parents $fnllist -t $mp/"
+    cp -a --parents $fnllist -t $mp/ 2> $templog  || LogAll "WARNING: Problem in $conf analysis" $templog
+    rm -f $MINDI_TMP/$conf.lis
 }
 
@@ -2773 +2772 @@
     > $templog
 
+    mkdir -p $targetdir
     # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
     for d in bin sbin lib lib64; do
@@ -2778 +2778 @@
             thelink=`readlink /$d`
             mkdir -p $targetdir/$thelink || LogAll "ERROR: Unable to create $thelink in $targetdir"
-            mv $targetdir/$d/* $targetdir/$d/.??* $targetdir/$thelink
+            mv $targetdir/$d/* $targetdir/$d/.??* $targetdir/$thelink 2> /dev/null
             if [ -d "$targetdir/$d" -a ! -h "$targetdir/$d" ]; then
                 rmdir $targetdir/$d
@@ -3030 +3030 @@
 
     mkdir -p $targetdir/proc
-    cp -a $MY_FSTAB $targetdir/tmp
     LogFile "---------------------------"
     LogFile "Content of initial targetdir:"