Changeset 2538 in MondoRescue

Timestamp:

Jan 9, 2010, 4:40:44 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3572@localhost: bruno | 2010-01-07 23:38:36 +0100
Reorg of files begining to start working on LVM low level fundtions and scripts

Location:

devel

Files:

• mindi/Makefile.PL (modified) (2 diffs)
• mindi/post-install.sh (modified) (3 diffs)
• mindi/sbin/mranalyze-lvm (modified) (1 diff)
• mondo/lib/MondoRescue/Base.pm (deleted)
• mr/lib/MondoRescue/Base.pm (modified) (2 diffs)
• mr/lib/MondoRescue/LVM.pm (moved) (moved from devel/mindi/lib/MondoRescue/Mindi/LVM.pm )

devel/mindi/Makefile.PL

@@ -8 +8 @@
     DISTNAME     => 'PBPKG',
     VERSION      => 'PBVER',
-    INST_SCRIPT  => 'blib/bin',
+    INST_SCRIPT  => 'blib/sbin',
     INSTALLDIRS  => 'perl',
     PREREQ_PM    => {
@@ -14 +14 @@
             #Template                         => 0,
     },    # e.g., Module::Name => 1.1
-    #ABSTRACT_FROM => 'bin/pb',   # retrieve abstract from module
+    #ABSTRACT_FROM => 'sbin/mindi',   # retrieve abstract from module
     AUTHOR        => 'Bruno Cornec <bruno#mondorescue.org>',
     EXE_FILES     => [ qw( sbin/mindi sbin/mranalyze-lvm sbin/mrprepare-lvm ) ],

devel/mindi/post-install.sh

@@ -4 +4 @@
 #
 
-if [ ! -f "mindi" ] ; then
-    echo "Please 'cd' to the directory you have just untarred." >> /dev/stderr
-    exit 1
-fi
-
 if [ "_$PREFIX" != "_" ]; then
     local=${HEAD}$PREFIX
     sublocal=$PREFIX
     if [ "_$CONFDIR" != "_" ]; then
-        conf=${HEAD}$CONFDIR/PBPROJ
-        subconf=$CONFDIR/PBPROJ
+        conf=${HEAD}$CONFDIR/PBPKG
+        subconf=$CONFDIR/PBPKG
     else
         echo "CONFDIR should be defined if PREFIX is defined"
@@ -22 +17 @@
     local=/usr/local
     sublocal=$local
-    if [ -f /usr/bin/mindi ]; then
-        echo "WARNING: /usr/bin/mindi exists. You should probably remove the mindi package !"
-    fi
-    conf=$local/etc/PBPROJ
+    conf=$local/etc/PBPKG
     subconf=$conf
 fi
 
 if [ _"$CACHEDIR" = _"" ]; then
-    CACHEDIR=$local/var/cache/mindi
+    CACHEDIR=$local/var/cache/PBPKG
 else
     CACHEDIR=${HEAD}$CACHEDIR
 fi
-locallib=$local/share/lib
-sublocallib="$locallib/PBPROJ"
-
-
-if uname -a | grep Knoppix > /dev/null || [ -e "/ramdisk/usr" ] ; then
-    local=/ramdisk/usr
-    sublocal=$local
-    conf=/ramdisk/etc
-    subconf=$conf
-    export PATH=/ramdisk/usr/sbin:/ramdisk/usr/bin:/$PATH
-fi
+sublocalshare="$local/share/PBPKG"
+sublocallib="$local/lib/PBPKG"
 
 MINDIVER=PBVER
@@ -52 +35 @@
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $sublocallib $CACHEDIR
+install -m 755 -d $conf $sublocallib $sublocalshare $CACHEDIR
 
-echo "Copying files ..."
-cp -af rootfs $sublocallib/mindi
-chmod 755 $sublocallib/mindi/rootfs/sbin/*
-install -m 644 msg-txt dev.tgz $sublocallib/mindi
-install -m 644 deplist.txt udev.files proliant.files $conf
+#echo "Copying files ..."
+#cp -af rootfs $sublocallib/mindi
+#chmod 755 $sublocallib/mindi/rootfs/sbin/*
+#install -m 644 msg-txt dev.tgz $sublocallib/mindi
+#install -m 644 deplist.txt udev.files proliant.files $conf
 
 # Substitute variables for mindi
 sed -i -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" $local/bin/mindi
-sed -i -e "s~= "YYY"~= "$subconf"~" $local/bin/mindi-bkphw
-install -m 755 parted2fdisk.pl $local/sbin
-
-# 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
-    # 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
-    (cd $local/sbin && ln -sf /sbin/fdisk parted2fdisk)
-    echo "Symlinking fdisk to parted2fdisk"
-    ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
-fi
+#sed -i -e "s~= "YYY"~= "$subconf"~" $local/bin/mindi-bkphw
 
 if [ "$PKGBUILDMINDI" != "true" ]; then
     chown -R root:root $sublocallib/mindi $conf
-    chown root:root $local/sbin/parted2fdisk.pl 
-    if [ "$ARCH" = "ia64" ] ; then
-        chown root:root $local/sbin/parted2fdisk
-    fi
 fi
 

devel/mindi/sbin/mranalyze-lvm

@@ -141 +141 @@
 }
 
-my $ret = mr_lvm_analyze($OUTPUT);
+my $lvmver = mr_lvm_analyze($OUTPUT);
 
-if ($ret == 0) {
+if ($lvmver == 0) {
     pb_log(1,"No LVM handling") 
 } else {

devel/mr/lib/MondoRescue/Base.pm

@@ -28 +28 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(mr_exit);
+our @EXPORT = qw(mr_init mr_exit);
 
 =pod
@@ -44 +44 @@
 =over 4
 
+=item B<mr_init>
+
+This function initialize MondoRescue, point to the right conf files, setup stuff
+It takes 1 parameter, the message to print if needed
+
+=cut
+
+sub mr_exit {
+
+my $msg = shift || "";
+
+if (defined $msg) {
+    pb_log($pbdebug,$msg);
+}
+
+pb_conf_init();
+}
 =item B<mr_exit>