Changeset 2812 in MondoRescue

Timestamp:

Apr 29, 2011, 3:40:08 PM (13 years ago)

Author:

Bruno Cornec

Message:

r2184@localhost (orig r2183): bruno | 2009-04-30 17:52:54 +0200
Tries to solve issue on ia64 where perl modules used by mindi were missing by adding a dedicated script handling them based on what is used on mandriva to make rpm deps

Location:

branches/2.2.8/mindi

Files:

• install.sh (modified) (3 diffs)
• mindi (modified) (2 diffs)
• mindi-get-perl-modules (added)

branches/2.2.8/mindi/install.sh

@@ -77 +77 @@
 install -m 644 msg-txt dev.tgz $locallib/mindi
 install -m 644 deplist.txt udev.files proliant.files $conf
+install -m 755 mindi-bkphw > $local/sbin
+install -m 755 mindi-get-perl-modules $local/sbin
+install -m 755 parted2fdisk.pl $local/sbin
 
 # 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~= "YYY"~= "$subconf"~" mindi-bkphw > $local/sbin/mindi-bkphw
 chmod 755 $local/sbin/mindi $local/sbin/mindi-bkphw
-install -m 755 parted2fdisk.pl $local/sbin
 
 install -m 644 mindi.8 $MANDIR
@@ -95 +96 @@
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
     install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
-    # Try to avoid the need ot additional perl modules at the moment
-    perl -pi -e 's/use strict;//' $locallib/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin
@@ -112 +111 @@
 fi
 
+# Generate the list of perl modules needed at restore time for mindi
+cat > $conf/perl-scripts << EOF
+$local/sbin/mindi-get-perl-modules
+$local/sbin/mindi-bkphw
+$local/sbin/parted2fdisk.pl
+EOF
+
 exit 0

branches/2.2.8/mindi/mindi

@@ -2291 +2291 @@
     fi
 
+    # Management of perl scripts delivered needed at restore time
+    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
+    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in perl scripts analysis" $MINDI_TMP/$$.log
+
     for w in cdrom groovy-stuff ; do
         mkdir -p mnt/$w
@@ -2441 +2445 @@
         set | grep -Ew "^$1" | cut -d= -f2
     fi
-    MindiExit 0
+    exit 0
 fi