Changeset 1039 in MondoRescue

Timestamp:

Jan 6, 2007, 6:12:54 PM (18 years ago)

Author:

Bruno Cornec

Message:

Work on FreeBSD's mindi

Location:

branches/stable

Files:

• mindi-busybox/distributions/freebsd (added)
• mindi/distributions/freebsd (added)
• mindi/distributions/freebsd/pkg-descr (added)
• mindi/distributions/freebsd/pkg-plist (added)
• mondo-doc/distributions/freebsd (added)
• mondo/distributions/freebsd (added)
• mondo/src/restore-scripts/mondo/hack-fstab (modified) (3 diffs)
• tools/build2pkg (modified) (1 diff)
• tools/distro-env (modified) (2 diffs)
• tools/pkg2mdv (modified) (1 diff)
• tools/svn2build (modified) (1 diff)

branches/stable/mondo/src/restore-scripts/mondo/hack-fstab

@@ -1 +1 @@
 #!/bin/sh
 #
+# $Id$
 #
-#
-#
-#
-# 2003/08/04
-# - added some logging
-#
-# mid-2002 --- created
-################################################
-
 
 LogIt() {
     echo "$1" >> /dev/stderr
 }
-
-
 
 
@@ -33 +23 @@
 #    echo "original_fstab_line = $original_fstab_line" >> /dev/stderr
     if [ "`grep "LABEL=" $old_fstab`" != "" ] ; then
-    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
-        device="LABEL=$mountpoint"
-    fi
+        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+            device="LABEL=$mountpoint"
+        fi
     fi
 
@@ -44 +34 @@
     if [ "$original_fstab_line" != "" ] ; then
 #   echo $original_fstab_line | gawk '{i=index($0,$4); print substr($0,i);}'
-    echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
+        echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
     else
-    echo -e "defaults 0 0"
+        echo -e "defaults 0 0"
     fi
 }
-
 
 

branches/stable/tools/build2pkg

@@ -125 +125 @@
         export pkg="$pkg $p-${PVER}.deb"
         # Et voila !
+    elif [  _"$dtype" = _"freebsd" ]; then
     elif [  _"$dfam" = _"slackware" ]; then
         mkdir -p $TOPBUILDDIR/build-${p}/install

branches/stable/tools/distro-env

@@ -61 +61 @@
             export dver = "sid"
         fi
+    elif [ -e /etc/motd && grep -q FreeBSD /etc/motd ]; then
+        export ddir="freebsd"
+        export dver=`awk '{print $2}' /etc/motd | cut -d- -f1`
     else
         export ddir="unknown"
@@ -109 +112 @@
     dtype="rpm"
     suf=".`echo $dver | sed 's/\.//'`mdv"
+elif [ $ddir = "freebsd" ]; then
+    dfam="freebsd"
+    dtype="port"
+    suf=".`echo $dver | sed 's/\.//'`fbsd"
 else
     dfam="unknown"

branches/stable/tools/pkg2mdv

@@ -75 +75 @@
     # Use mkrel for mdv
     perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
-    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec@mandriva.org>\nRelease:/" SPECS/$p.spec
+    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec\@mandriva.org>\nRelease:/" SPECS/$p.spec
     perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
     $TOOLHOME/mdv-changelog.pl SPECS/$p.spec

branches/stable/tools/svn2build

@@ -86 +86 @@
         elif [ "$dtype" = "tgz" ]; then
             m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
+        elif [ "$dtype" = "port" ]; then
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
         elif [ "$dtype" = "deb" ]; then
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver