Changeset 2462 in MondoRescue for branches/2.2.10/mindi/install.sh

Timestamp:

Oct 20, 2009, 4:07:00 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3548@localhost: bruno | 2009-10-16 19:18:27 +0200

• mindi now boots in a QEMU VM without busybox
• mindi is now noarch as a consequence
• MINDI_LIB becomes MINDI_DATA for coherency and as a consequence
• CACHEDIR becomes MINDI_CACHE for coherency and it's a build parameter and not hardcoded anymore in mindi
• THat variable is also used at restore time for mondorestore.cfg e.g.
• FAILSAFE kernel is gone. Just use another kernel of your choice. Most std kernels work anyway
• TurnTgzIntoRdz rewritten and now really computes data disk size and not suppose its size
• Interface mondo/mindi changed again => incompatible
• Non-bootable media not supported anymore.
• Mondorescue adapted to these changes but not tested yet
• Doc updated as well

File:

• branches/2.2.10/mindi/install.sh (modified) (4 diffs)

branches/2.2.10/mindi/install.sh

@@ -43 +43 @@
 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
-if [ _"$CACHEDIR" = _"" ]; then
-    CACHEDIR=$local/var/cache/mindi
+if [ _"$MINDI_CACHE" = _"" ]; then
+    localcache=$local/var/cache/mindi
 else
-    CACHEDIR=${HEAD}$CACHEDIR
+    localcache=${HEAD}$MINDI_CACHE
 fi
 if [ _"$MANDIR" = _"" ]; then
@@ -58 +58 @@
     DOCDIR=${HEAD}$DOCDIR/mindi-$MINDIVER
 fi
-if [ _"$LIBDIR" = _"" ]; then
-    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
-    echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
-    echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
-    sublocallib="$locallib/mindi"
+if [ _"$DATADIR" = _"" ]; then
+    localdata="$local/share"
+    sublocaldata="$localdata/mindi"
 else
-    locallib=${HEAD}$LIBDIR
-    sublocallib="$LIBDIR/mindi"
+    localdata=${HEAD}$DATADIR
+    sublocaldata="$DATADIR/mindi"
 fi
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR $conf/deplist.d
+install -m 755 -d $conf $localdata/mindi $MANDIR $local/sbin $localcache $conf/deplist.d
 
 echo "Copying files ..."
-cp -af rootfs $locallib/mindi
-chmod 755 $locallib/mindi/rootfs/sbin/*
-install -m 755 analyze-my-lvm $locallib/mindi
-install -m 644 msg-txt dev.tgz $locallib/mindi
+cp -af rootfs $localdata/mindi
+chmod 755 $localdata/mindi/rootfs/sbin/*
+install -m 755 analyze-my-lvm $localdata/mindi
+install -m 644 msg-txt dev.tgz $localdata/mindi
 install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files mindi.conf $conf
 for f in deplist.d/*.conf; do
@@ -85 +83 @@
 
 # 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
+sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_DATA=LLL~MINDI_DATA=$sublocaldata~" -e "s~^MINDI_CACHE=CCC~MINDI_CACHE=$MINDI_CACHE~" mindi > $local/sbin/mindi
+sed -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^export MINDI_CACHE=CCC~export MINDI_CACHE=$MINDI_CACHE~" rootfs/sbin/init > $localdata/mindi/rootfs/sbin/init
 chmod 755 $local/sbin/mindi $local/sbin/mindi-bkphw
 
@@ -94 +93 @@
 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
+    install -s -m 755 $local/sbin/parted2fdisk.pl $localdata/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin
     (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
     echo "Symlinking fdisk to parted2fdisk"
-    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
+    ( cd $localdata/mindi/rootfs/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 -R root:root $localdata/mindi $conf # $DOCDIR
+    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $localdata/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then
         chown root:root $local/sbin/parted2fdisk