Changeset 238 in MondoRescue for trunk/mindi

Timestamp:

Dec 19, 2005, 8:25:31 PM (18 years ago)

Author:

bcornec

Message:

merge -r235:237 $SVN_M/branches/2.05

Location:

trunk/mindi

Files:

• install.sh (modified) (7 diffs)
• mindi (modified) (1 diff)
• mindi.spec (modified) (1 diff)

trunk/mindi/install.sh

@@ -27 +27 @@
 fi
 
-echo "mindi will be installed under $local"
+MINDIVER=`cat VERSION`
+echo "mindi $MINDIVER will be installed under $local"
 
 echo "Creating target directories ..."
-install -g root -o root -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/doc/mindi
+install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/share/doc/mindi-$MINDIVER
 
 echo "Copying files ..."
-install -g root -o root -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
-install -g root -o root -m 644 deplist.txt $conf
+install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $local/lib/mindi
+install -m 644 deplist.txt $conf
 
 cp -af rootfs aux-tools Mindi $local/lib/mindi
@@ -40 +41 @@
 chmod 755 $local/lib/mindi/rootfs/sbin/*
 chmod 755 $local/lib/mindi/aux-tools/sbin/*
-chown -R root:root $local/lib/mindi
 
 if [ "$RPMBUILDMINDI" = "true" ]; then
@@ -48 +48 @@
 fi
 chmod 755 $local/sbin/mindi
-chown root:root $local/sbin/mindi
-install -g root -o root -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
+install -m 755 analyze-my-lvm parted2fdisk.pl $local/sbin
 
-install -g root -o root -m 644 mindi.8 $local/share/man/man8
-install -g root -o root -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/doc/mindi
+install -m 644 mindi.8 $local/share/man/man8
+install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/share/doc/mindi-$MINDIVER
 
 ARCH=`/bin/arch`
@@ -63 +62 @@
 if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH ]; then
         echo "Installing busybox ..."
-        install -s -g root -o root -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
+        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH $local/lib/mindi/rootfs/bin/busybox
 else
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
@@ -70 +69 @@
     if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
         echo "Installing busybox.net ..."
-        install -s -g root -o root -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
+        install -s -m 755 $local/lib/mindi/rootfs/bin/busybox-$ARCH.net $local/lib/mindi/rootfs/bin/busybox.net
     else
         echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
@@ -84 +83 @@
     if [ -f $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
         echo "Installing parted2fdisk ..."
-        install -s -g root -o root -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
-        install -s -g root -o root -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
+        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/lib/mindi/rootfs/sbin/parted2fdisk
+        install -s -m 755 $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
     else
         echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
@@ -98 +97 @@
 rm -f $local/lib/mindi/rootfs/sbin/parted2fdisk-*
 
+if [ "$RPMBUILDMINDI" != "true" ]; then
+    chown -R root:root $local/lib/mindi $conf/mindi $conf $local/share/doc/mindi-$MINDIVER
+    chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
+    if [ "$ARCH" = "ia64" ] ; then
+        chown root:root $local/sbin/parted2fdisk
+    fi
+fi
+
 exit 0

trunk/mindi/mindi

@@ -27 +27 @@
 
 MINDI_REV=`echo '$Rev$' | awk '{print $2}'`
-
-MINDI_VERSION=1.05-r$MINDI_REV
+MINDI_VER=`cat VERSION`
+
+MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
 MINDI_PREFIX=XXX
 MINDI_CONF=YYY

trunk/mindi/mindi.spec

@@ -9 +9 @@
 
 %define name    mindi
-%define version 1.04_berlios
+%define version VVV
 %define mrel    1