Changeset 1410


Ignore:
Timestamp:
May 7, 2007, 3:21:55 PM (13 years ago)
Author:
bruno
Message:

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

Location:
branches/2.2.4/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.4/mindi/distributions/debian/rules

    r1406 r1410  
    88# Define package name for a one-stop change.
    99PACKAGE_NAME = mindi
     10
     11# PREFIX for installtion
     12export PREFIX=/usr
    1013
    1114configure:
     
    2629    dh_installdirs
    2730    # Build the installation tree:
    28     export PREFIX=/usr
    29     ( 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 )
     31    (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 )
    3032
    3133# Build architecture-independent files here.
  • branches/2.2.4/mindi/rootfs/sbin/init

    r1403 r1410  
    3131    echo -en "Copying boot device to $outfile..."
    3232    if [ -e "$outfile" ] ; then
    33     echo "OK."
    34     return 0
     33        echo "OK."
     34        return 0
    3535    fi
    3636    mkdir -p $outfile
     
    3838    cp -pRdf $devfile $outfile
    3939    if [ "$?" -ne "0" ] ; then
    40     echo "Failed."
    41     return 1
     40        echo "Failed."
     41        return 1
    4242    else
    43     echo "OK."
    44     return 0
     43        echo "OK."
     44        return 0
    4545    fi
    4646}
     
    106106    res=$?
    107107    if [ "$res" -eq "0" ] ; then
    108     grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
    109     echo "media-dev $tapedev" >> /tmp/mr.cfg
     108        grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
     109        echo "media-dev $tapedev" >> /tmp/mr.cfg
    110110        cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
    111111    fi
     
    138138
    139139    if [ "$res" -ne "0" ] ; then
    140     cd /
    141     LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
    142     HandleCDROMorFloppies
    143     res=$?
     140        cd /
     141        LogIt "Failed to use tape as extended datadisk. Reverting to floppies." 1
     142        HandleCDROMorFloppies
     143        res=$?
    144144    else
    145 #   clear
    146     LogIt "Using tape as extended datadisk. Good." 3
    147     echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
    148     res=0
     145#       clear
     146        LogIt "Using tape as extended datadisk. Good." 3
     147        echo "Using tape as extd ddisk." > /tmp/TAPEDEV-HAS-DATA-DISKS
     148        res=0
    149149        CD_MOUNTED_OK=yes
    150150    fi
     
    296296        /tmp/start-lvm &
    297297        for i in 1 2 3 4 5 ; do
    298         echo -en "."
    299         sleep 1
     298            echo -en "."
     299            sleep 1
    300300        done
    301301        echo "Done."
     
    412412    local i fname
    413413    for i in 0 1 2 3 ; do
    414     fname="/proc/driver/cciss/cciss$i"
    415     if [ -e "$fname" ] ; then
    416         LogIt "Engaging $fname"
    417         echo "engage scsi" > $fname
    418         LogIt "...result=$?"
    419     fi
     414        fname="/proc/driver/cciss/cciss$i"
     415        if [ -e "$fname" ] ; then
     416            LogIt "Engaging $fname"
     417            echo "engage scsi" > $fname
     418            LogIt "...result=$?"
     419        fi
    420420    done
    421421}
Note: See TracChangeset for help on using the changeset viewer.