Changeset 1410 in MondoRescue

Timestamp:

May 7, 2007, 3:21:55 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a Debian packaging bug for good (#142 and #126)

Location:

branches/2.2.4/mindi

Files:

• distributions/debian/rules (modified) (2 diffs)
• rootfs/sbin/init (modified) (6 diffs)

branches/2.2.4/mindi/distributions/debian/rules

@@ -8 +8 @@
 # Define package name for a one-stop change.
 PACKAGE_NAME = mindi
+
+# PREFIX for installtion
+export PREFIX=/usr
 
 configure:
@@ -26 +29 @@
     dh_installdirs
     # Build the installation tree:
-    export PREFIX=/usr
-    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
+    (export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
 
 # Build architecture-independent files here.

branches/2.2.4/mindi/rootfs/sbin/init

@@ -31 +31 @@
     echo -en "Copying boot device to $outfile..."
     if [ -e "$outfile" ] ; then
-    echo "OK."
-    return 0
+        echo "OK."
+        return 0
     fi
     mkdir -p $outfile
@@ -38 +38 @@
     cp -pRdf $devfile $outfile
     if [ "$?" -ne "0" ] ; then
-    echo "Failed."
-    return 1
+        echo "Failed."
+        return 1
     else
-    echo "OK."
-    return 0
+        echo "OK."
+        return 0
     fi
 }
@@ -106 +106 @@
     res=$?
     if [ "$res" -eq "0" ] ; then
-    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
-    echo "media-dev $tapedev" >> /tmp/mr.cfg
+        grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
+        echo "media-dev $tapedev" >> /tmp/mr.cfg
         cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
     fi
@@ -138 +138 @@
 
     if [ "$res" -ne "0" ] ; then
-    cd /
-    LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
-    HandleCDROMorFloppies
-    res=$?
+        cd /
+        LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
+        HandleCDROMorFloppies
+        res=$?
     else
-#   clear
-    LogIt "Using tape as extended datadisk. Good." 3
-    echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
-    res=0
+#       clear
+        LogIt "Using tape as extended datadisk. Good." 3
+        echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
+        res=0
         CD_MOUNTED_OK=yes
     fi
@@ -296 +296 @@
         /tmp/start-lvm &
         for i in 1 2 3 4 5 ; do
-        echo -en "."
-        sleep 1
+            echo -en "."
+            sleep 1
         done
         echo "Done."
@@ -412 +412 @@
     local i fname
     for i in 0 1 2 3 ; do
-    fname="/proc/driver/cciss/cciss$i"
-    if [ -e "$fname" ] ; then
-        LogIt "Engaging $fname"
-        echo "engage scsi" > $fname
-        LogIt "...result=$?"
-    fi
+        fname="/proc/driver/cciss/cciss$i"
+        if [ -e "$fname" ] ; then
+            LogIt "Engaging $fname"
+            echo "engage scsi" > $fname
+            LogIt "...result=$?"
+        fi
     done
 }