Changeset 3684 in MondoRescue

Timestamp:

Aug 30, 2017, 7:24:16 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Skip a potential Warning when calling parted (Warning: The disk CHS geometry (258,255,63) reported by the operating system does not match the geometry stored on the disk label (1012,128,32).)
• Improve some error msgs for coherency
• Improve ansible delivery for perl Hokks to add svn hook support

Location:

branches/3.3

Files:

• ansible/roles/svn/tasks/main.yml (modified) (1 diff)
• mindi/mindi-bkphw (modified) (2 diffs)
• mindi/mindi-hpsa (modified) (2 diffs)
• mindi/mr-parted2fdisk (modified) (1 diff)

branches/3.3/ansible/roles/svn/tasks/main.yml

@@ -9 +9 @@
   tags: subversion
 
+- name: Check that perl-SVN-Hook is installed
+  urpmi: name=perl-SVN-Hook state=installed
+  tags: subversion
+
 - name: Configure subversion
   copy: src=files/svnserve dest=/etc/sysconfig/svnserve owner=root group=root mode=0644 backup=yes
+  notify:
+    - restart subversion
+  tags: subversion
+
+- name: Configure subversion Hooks for mondorescue.org
+  copy: src=files/hooks-{{ item }}.pl dest=/prj/svn/{{ item }}/hooks/hooks.pl owner=bruno group=users mode=0755 backup=yes
+  with_items:
+    - mondorescue
+    - pb
   notify:
     - restart subversion

branches/3.3/mindi/mindi-bkphw

@@ -66 +66 @@
 my $productname = undef;
 
-die "No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
+die "ERROR: No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
 my $locbkpdir = "/bkphw";
 my $bkpdir = "$ARGV[0]$locbkpdir";
-die "No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1]));
+die "ERROR: No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1]));
 my $confdir = "$ARGV[1]";
 
-die "You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
+die "ERROR: You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
 
 mkdir $bkpdir,0755 if (! -d $bkpdir) ;
-open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
+open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "ERROR: You need /usr/sbin/dmidecode for mindi hardware support";
 while (<SYSTEM>) {
     next if (/^#/);
@@ -90 +90 @@
     print "INFO: You can install SDR packages to benefit from mindi's enhanced ProLiant support\n";
     print "INFO: Get them from http://downloads.linux.hpe.com/SDR/\n";
-    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
+    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "ERROR: 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";
+    open(TOOLS,"> $bkpdir/../tools.files") || die "ERROR: 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";
+    open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "ERROR: Unable to open $bkpdir/../mindi-rsthw";
     print SCRIPT  << 'EOF';
 #!/bin/bash

branches/3.3/mindi/mindi-hpsa

@@ -17 +17 @@
 my $productname = undef;
 
-die "You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
+die "ERROR: You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
 
 mkdir $bkpdir,0755 if (! -d $bkpdir) ;
-open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
+open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "ERROR: You need /usr/sbin/dmidecode for mindi hardware support";
 while (<SYSTEM>) {
     next if (/^#/);
@@ -35 +35 @@
     print "You can install SDR packages to benefit from mindi's enhanced ProLiant support\n";
     print "Get them from http://downloads.linux.hpe.com/SDR/\n";
-    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
+    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "ERROR: 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";
+    open(TOOLS,"> $bkpdir/../tools.files") || die "ERROR: 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";
+    open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "ERROR: Unable to open $bkpdir/../mindi-rsthw";
     print SCRIPT  << 'EOF';
 #!/bin/bash

branches/3.3/mindi/mr-parted2fdisk

@@ -756 +756 @@
     # Skip 2 first lines
     $d = <PARTED>;
+    # Skip potential warnings first
+    $d = <PARTED> if ($d =~ /^Warning:/);
     if ($d !~ /^BYT/) {
         die "Your $parted command doesn't behave correctly in machine readable mode";