Changeset 3217 in MondoRescue

Timestamp:

Dec 30, 2013, 10:46:15 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Relocate all the installation of mindi under /usr especially we now use /usr/sbin instead of /sbin, even if not FHS compliant :-(

File:

• branches/3.2/mindi/install.sh (modified) (5 diffs)

branches/3.2/mindi/install.sh

@@ -27 +27 @@
     conf=$local/etc/mindi
     subconf=$conf
-    echo $PATH | grep $local/sbin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/sbin to your PATH."
+    echo $PATH | grep $local/usr/sbin > /dev/null || echo "Warning - your PATH environmental variable is BROKEN. Please add $local/usr/sbin to your PATH."
 fi
 
@@ -54 +54 @@
     MANDIR=${HEAD}$MANDIR/man8
 fi
+if [ _"$SBINDIR" = _"" ]; then
+    SBINDIR=$local/sbin
+else
+    SBINDIR=${HEAD}$SBINDIR
+fi
 if [ _"$DOCDIR" = _"" ]; then
     DOCDIR=$local/share/doc/mindi-$MINDIVER
@@ -70 +75 @@
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR $conf/deplist.d
+install -m 755 -d $conf $locallib/mindi $MANDIR $SBINDIR $CACHEDIR $conf/deplist.d
 
 echo "Copying files ..."
 cp -af rootfs $locallib/mindi
-chmod 755 $locallib/mindi/rootfs/sbin/*
+chmod 755 $locallib/mindi/rootfs/usr/sbin/*
 install -m 755 analyze-my-lvm $locallib/mindi
 install -m 644 msg-txt dev.tgz $locallib/mindi
@@ -83 +88 @@
 
 # Substitute variables for mindi
-sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
-chmod 755 $local/sbin/mindi
+sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $SBINDIR/mindi
+chmod 755 $SBINDIR/mindi
 install -m 644 mindi.8 $MANDIR
 
 # Manage perl script man pages
 for s in mindi-bkphw mindi-get-perl-modules parted2fdisk.pl; do
-    install -m 755 $s $local/sbin
-    pod2man -c "$s a MondoRescue tool" --section=8 --release="$VERSTR" $local/sbin/$s > $s.8
+    install -m 755 $s $SBINDIR
+    pod2man -c "$s a MondoRescue tool" --section=8 --release="$VERSTR" $SBINDIR/$s > $s.8
     install -m 644 $s.8 $MANDIR
     # Generate the list of perl modules needed at restore time for mindi
     cat > $conf/perl-scripts << EOF
-$sublocal/sbin/$s
+$SBINDIR/$s
 EOF
 done
@@ -105 +110 @@
 # Managing parted2fdisk
 if [ "$ARCH" = "ia64" ] ; then
-    (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
+    (cd $SBINDIR && ln -sf parted2fdisk.pl parted2fdisk)
+    install -s -m 755 $SBINDIR/parted2fdisk.pl $locallib/mindi/rootfs/usr/sbin/parted2fdisk
 else
-    # FHS requires fdisk under /sbin
-    (cd $local/sbin && ln -sf ../../sbin/fdisk parted2fdisk)
+    # FHS requires fdisk under /sbin - BUT /sbin is now obsolete on recent distros :-(
+    (cd $SBINDIR && ln -sf ../../sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
-    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
+    ( cd $locallib/mindi/rootfs/usr/sbin && ln -sf fdisk parted2fdisk)
 fi
 
 if [ "$PKGBUILDMINDI" != "true" ]; then
     chown -R root:root $locallib/mindi $conf # $DOCDIR
-    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl 
+    chown root:root $SBINDIR/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $SBINDIR/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then
-        chown root:root $local/sbin/parted2fdisk
+        chown root:root $SBINDIR/parted2fdisk
     fi
 fi