Changeset 2882 in MondoRescue for branches

Timestamp:

Oct 7, 2011, 4:16:17 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Add compatibility with the latest SSSTK + PSP content for HP ProLiant + branding homogeneous now. We only take conrep out of the SSSTK pending a package availability. Using hpacuscripting now. Review of parameters called following test made.

Location:

branches/2.2.9

Files:

• mindi/README.ProLiant (moved) (moved from branches/2.2.9/mindi/README.proliant ) (1 diff)
• mindi/README.bkphw (modified) (1 diff)
• mindi/README.bootparam (modified) (1 diff)
• mindi/deplist.d/ProLiant.conf (moved) (moved from branches/2.2.9/mindi/deplist.d/proliant.conf ) (1 diff)
• mindi/install.sh (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mindi/mindi-bkphw (modified) (2 diffs)
• mindi/proliant.files (deleted)
• mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/2.2.9/mindi/README.ProLiant

@@ -1 +1 @@
 $Id$
 
-If you're making a backup with mondoarchive on a Proliant system that you want to be able to restore using the Virtual Media function of Proliants, then you have to ensure that the required drivers will be available at restore time. 
+-------------------------------------------------------------------------------------
+
+If you have a ProLiant system you first need to get the Smart Start Scripting Toolkit, and the hponcfg and hpacucli packages. Due to licenses issues, mindi cannot provide those tools itself. You need to get them from http://www.hp.com/servers/sstoolkit and http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/
+
+Mindi expects to find those tools under /usr/sbin as described in the deplist.d/ProLiant.conf configuration file. Here are the steps to set it up correctly:
+
+Older URL:
+wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v40154/ss-scripting-toolkit-linux-1.70.tar.gz
+wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v43548/ss-scripting-toolkit-linux-1.81.tar.gz
+wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v44247/ss-scripting-toolkit-linux-1.90.tar.gz
+
+cd /tmp
+wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1221080004/v63551/ss-scripting-toolkit-linux-8.70.tar.gz
+mkdir ssstk
+cd ssstk
+tar xvfz ../ss-scripting-toolkit-linux-8.70.tar.gz
+cp -a utilities/conrep /usr/sbin
+cp -a utilities/conrep.xml /usr/share/conrep/conrep.xml
+
+# For versions <= 1.90
+cp -a utilities/cpqacuxe/cpqacuxe /usr/local/bin
+cp -a utilities/cpqacuxe/bld /usr/local/bin
+mv /usr/local/bin/bld/*.so /usr/local/lib
+echo /usr/local/lib >> /etc/ld.so.conf
+ldconfig
+
+
+wget http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/RedHat/6Server/x86_64/8.72/hpacucli-8.70-8.0.noarch.rpm
+rpm -Uvh hpacucli-8.70-8.0.noarch.rpm
+(will install hpacuscripting under /usr/sbin)
+wget http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/RedHat/6Server/x86_64/8.72/hponcfg-3.1.1-0.noarch.rpm
+rpm -Uvh hponcfg-3.1.1-0.noarch.rpm
+(will install hponcfg under /usr/sbin)
+
+You're now ready to check your configuration by running:
+mindi-bkphw /var/cache/mindi /etc/mindi
+[First parameter is the directory where files will be generated,
+ Second parameter is the configuration directory of the file deplist.d/ProLiant.conf is located]
+
+-------------------------------------------------------------------------------------
+If you're making a backup with mondoarchive on a ProLiant system that you want to be able to restore using the Virtual Media function of ProLiants, then you have to ensure that the required drivers will be available at restore time. 
 In order to ensure that, you may want to do on 2.2.x (x < 5) versions:
 - Edit your /usr/sbin/mindi script

branches/2.2.9/mindi/README.bkphw

@@ -5 +5 @@
 Mindi has a script able to store the Hardware configuration and those parameters may be restored before launching mondorestore during the boot phase computed by mindi, in order to re-setup the machine as the original one.
 
-For the moment, only HP Proliant systems are supported. If you have tools to allow support for other type of machines, feel free to contribute patches to that script.
+For the moment, only HP ProLiant systems are supported. If you have tools to allow support for other type of machines, feel free to contribute patches to that script. For details on how to use ProLiant tools, please look at the README.ProLiant file
 
-If you have a Proliant system you first need to get the Smart Start Scripting Toolkit. Due to licenses issues, mindi cannot provide those tools itself. You need to get them from http://www.hp.com/servers/sstoolkit
-
-Mindi expects to find those tools under /usr/local/bin as described in the deplist.d/proliant.conf configuration file. Here are the steps to set it up correctly:
-
-Older URL:
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v40154/ss-scripting-toolkit-linux-1.70.tar.gz
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v43548/ss-scripting-toolkit-linux-1.81.tar.gz
-
-cd /tmp
-wget ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p308169895/v44247/ss-scripting-toolkit-linux-1.90.tar.gz
-mkdir ssstk
-cd ssstk
-tar xvfz ../ss-scripting-toolkit-linux-1.90.tar.gz
-cp -a utilities/hponcfg /usr/local/bin
-cp -a utilities/conrep /usr/local/bin
-cp -a utilities/conrep.xml /usr/local/bin
-# For versions <= 1.90
-cp -a utilities/cpqacuxe/cpqacuxe /usr/local/bin
-cp -a utilities/cpqacuxe/bld /usr/local/bin
-mv /usr/local/bin/bld/*.so /usr/local/lib
-# For recent versions
-cp -a utilities/hpacucli /usr/local/bin
-echo /usr/local/lib >> /etc/ld.so.conf
-ldconfig
-
-You're now ready to check your configuration by running:
-mindi-bkphw /var/cache/mindi /etc/mindi
-[First parameter is the directory where files will be generated,
- Second parameter is the directory of the file proliant.files is located]
-
-For these tools to work you may have to install additional packages such as hpasm and hprsm from the HP Web site, as well as some libstdc++ compatibility packages (compat-libstdc++-33 and compat-libstdc++-296 on RHEL 5 e.g.)
-
-In order to have a working hponcfg binary you also need to install the hprsm/hpasm packages from HP Web site. Refer to http://welcome.hp.com/country/us/en/support.html?pageDisplay=drivers
-
+2011-10-07 Move ProLiant section to a specific file
 2007-05-30 Initial file

branches/2.2.9/mindi/README.bootparam

@@ -40 +40 @@
 
 nohw
-    Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (Proliant only)
+    Do not call the mindi-rsthw script which try to restore also your BIOSes configuration (ProLiant only for now)
 
 nolvm

branches/2.2.9/mindi/deplist.d/ProLiant.conf

@@ -4 +4 @@
 # Proliant extended support if available
 # Look at http://www.hp.com/servers/sstoolkit
+# the xml file needs to go under /usr/share/conrep
+/usr/sbin/conrep
+
+# Look at http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/
+/usr/sbin/hpacuscripting
+/usr/sbin/hponcfg
+
+# You may add your FW update here with a ful path - They need to be in executable mode
+# /usr/local/bin/CP012345.scexe
 #
-/usr/local/bin/conrep
-/usr/local/bin/cpqacuxe
-/usr/local/bin/hponcfg
-/usr/local/bin/hpacucli
+# Older version which should be put after
+#
+#/usr/local/bin/conrep
+#/usr/local/bin/hponcfg
+#/usr/local/bin/hpacucli
+#/usr/local/bin/cpqacuxe
+#/opt/compaq/cpqacuxe/bld/.acuxebin
+#/usr/local/bin/bld/.acuxebin

branches/2.2.9/mindi/install.sh

@@ -76 +76 @@
 install -m 755 analyze-my-lvm $locallib/mindi
 install -m 644 msg-txt dev.tgz $locallib/mindi
-install -m 644 deplist.txt udev.files proliant.files mindi.conf $conf
+install -m 644 deplist.txt udev.files mindi.conf $conf
 for f in deplist.d/*.conf; do
     install -m 644 $f $conf/deplist.d

branches/2.2.9/mindi/mindi

@@ -2553 +2553 @@
     fi
 
-    # Management of potential HW info (Proliant only at the moment)
+    # Management of potential HW info (ProLiant only at the moment)
     rm -rf $MINDI_CACHE/bkphw
     mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE

branches/2.2.9/mindi/mindi-bkphw

@@ -11 +11 @@
 # Handling Configuration files
 my $tool = "";
-my $tooldir = "";
 my $ret = 0;
 my $productname = undef;
@@ -36 +35 @@
 if ($productname =~ /proliant/i) {
     print "Detected a $productname. Nice. Continue to support my job :-)\n";
-    print "Activating Proliant support for mindi\n";
-    open(PROLIANT,"$confdir/proliant.files") || die "Unable to open $confdir/proliant.files";
+    print "Activating ProLiant support for mindi\n";
+    print "You can install the SmartStart Scripting toolkit tool $tool\nto benefit from mindi's enhanced ProLiant support\n";
+    print "Get it from http://www.hp.com/servers/sstoolkit\n";
+    print "And use the SDR to get all other HP ProLiant packages\n";
+    print "Get it from http://downloads.linux.hp.com/SDR/downloads/ProLiantSupportPack/\n";
+    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
+    # generate a list of what need to be put on the backup media
     open(TOOLS,"> $bkpdir/../tools.files") || die "Unable to open $bkpdir/../tools.files";
+    # generate a script that will be launched at rstore time to perform the HW setup
     open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "Unable to open $bkpdir/../mindi-rsthw";
     print SCRIPT  << 'EOF';
 #!/bin/bash
 #
+# Script generated by mindi
+#
 # This script will restore potentially your HW configuration
-# on your system before partioning occurs
+# on your system before partioning occurs.
+#
 # You may want to reboot after that step if you think that
 # resetting BIOS parameters to the value restored
-# may have an impact on you restoration process
+# may have an impact on your restoration process or if
+# you want to benefit from any firmware update that could have happened.
 #
-# put dynamic libraries at an accessible place
-for l in /usr/local/lib/*; do
-    ln -sf $l /usr/lib
-done
 EOF
     while($tool = <PROLIANT>) {
+        my $hasfound = 0;
         next if ($tool =~ /^#/);
         chomp($tool);
-        $tooldir = dirname($tool);
+        # skip non-executable/exising binaries
         if (! (-x $tool)) {
-            print "You could install the SmartStart Scripting toolkit tool $tool\nto benefit from mindi's enhanced hardware support\n";
-            print "Get it from http://www.hp.com/servers/sstoolkit\n";
             next;
         } else {
-            print "Found $tool, activating enhanced HP Proliant support in mindi\n";
+            print "Found $tool, activating enhanced HP ProLiant support in mindi\n";
             print TOOLS "$tool\n";
         }
         if ($tool =~ /\/conrep$/) {
-            $ret = system("cd $tooldir ; $tool -s -f$bkpdir/conrep.dat");
-            print SCRIPT "(cd $tooldir ; $tool -l -f$locbkpdir/conrep.dat)\n";
-            print TOOLS "$tool.xml\n";
+            if (! -f "/usr/share/conrep/conrep.xml") {
+            } else {
+                $ret = system("$tool -s -x /usr/share/conrep/conrep.xml -f$bkpdir/conrep.dat");
+                print SCRIPT "($tool -l -f$locbkpdir/conrep.dat)\n";
+                print TOOLS "$tool.xml\n";
+            }
         }
-        if ($tool =~ /\/.acuxebin$/) {
+        if ($tool =~ /\/hpacuscripting$/) {
+            $hasfound = 1;
             my $dir=basename($tool);
-            $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/cpqacuxe.dat");
-            print SCRIPT "export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -i $locbkpdir/cpqacuxe.dat\n";
-            print TOOLS "$tooldir/bld\n";
-        }
-        if ($tool =~ /\/hpacucli$/) {
-            my $dir=basename($tool);
-            $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/hpacucli.dat");
-            print SCRIPT "export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -i $locbkpdir/hpacucli.dat\n";
-            print TOOLS "$tooldir/bld\n";
+            # Just backup internal info for a DR
+            $ret = system("$tool -c $bkpdir/hpacuscripting.dat -internal");
+            # We could want to reset it before.
+            print SCRIPT "# $tool -reset -i $locbkpdir/hpacusripting.dat\n";
+            print SCRIPT "$tool -i $locbkpdir/hpacusripting.dat\n";
         }
         if ($tool =~ /\/hponcfg$/) {
-            $ret = system("$tool -w $bkpdir/hponcfg.dat");
-            print SCRIPT "$tool -r $locbkpdir/hponcfg.dat\n";
+            $ret = system("$tool -a -w $bkpdir/hponcfg.dat");
+            print SCRIPT "$tool -f $locbkpdir/hponcfg.dat\n";
         }
         if ($tool =~ /\.scexe$/) {
-            print "Found $tool, that firmware will be applied at restore time on your HP Proliant\n";
-            print SCRIPT "./$tool\n";
+            print "Found $tool, that firmware will be applied at restore time on your HP ProLiant\n";
+            print SCRIPT "./$tool -s\n";
+        }
+        # Kept for compatibility with older version of tools
+        if (($tool =~ /\/hpacucli$/) && ($hasfound == 0)) {
+            my $dir=basename($tool);
+            $ret = system("$tool -c $bkpdir/hpacucli.dat");
+            print SCRIPT "$tool -i $locbkpdir/hpacucli.dat\n";
         }
         if ($ret != 0) {

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -133 +133 @@
 
 /**************************************************************************
- * COMPAQ PROLIANT Stuff:  needs some special help                        *
+ * COMPAQ ProLiant Stuff:  needs some special help                        *
 **************************************************************************/
 
 /**
- * The message to display if we detect that the user is using a Compaq Proliant.
+ * The message to display if we detect that the user is using a Compaq ProLiant.
  */
 #define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo media in Interactive Mode."
@@ -231 +231 @@
  * @ingroup restoreUtilityGroup
  */
-void offer_to_abort_because_Compaq_Proliants_suck(void)
+void offer_to_abort_because_Compaq_ProLiants_suck(void)
 {
     popup_and_OK(COMPAQ_PROLIANTS_SUCK);
@@ -513 +513 @@
                 if (partition_table_contains_Compaq_diagnostic_partition
                     (mountlist)) {
-                    offer_to_abort_because_Compaq_Proliants_suck();
+                    offer_to_abort_because_Compaq_ProLiants_suck();
                     done = TRUE;
                 } else {
@@ -817 +817 @@
         if (partition_table_contains_Compaq_diagnostic_partition
             (mountlist)) {
-            offer_to_abort_because_Compaq_Proliants_suck();
+            offer_to_abort_because_Compaq_ProLiants_suck();
         } else {
             twenty_seconds_til_yikes();