Changeset 3684


Ignore:
Timestamp:
Aug 30, 2017, 7:24:16 PM (3 months ago)
Author:
bruno
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/ansible/roles/svn/tasks/main.yml

    r3655 r3684  
    99  tags: subversion
    1010
     11- name: Check that perl-SVN-Hook is installed
     12  urpmi: name=perl-SVN-Hook state=installed
     13  tags: subversion
     14
    1115- name: Configure subversion
    1216  copy: src=files/svnserve dest=/etc/sysconfig/svnserve owner=root group=root mode=0644 backup=yes
     17  notify:
     18    - restart subversion
     19  tags: subversion
     20
     21- name: Configure subversion Hooks for mondorescue.org
     22  copy: src=files/hooks-{{ item }}.pl dest=/prj/svn/{{ item }}/hooks/hooks.pl owner=bruno group=users mode=0755 backup=yes
     23  with_items:
     24    - mondorescue
     25    - pb
    1326  notify:
    1427    - restart subversion
  • branches/3.3/mindi/mindi-bkphw

    r3530 r3684  
    6666my $productname = undef;
    6767
    68 die "No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
     68die "ERROR: No CACHE_DIR parameter" if ((not defined $ARGV[0]) || (! -d $ARGV[0]));
    6969my $locbkpdir = "/bkphw";
    7070my $bkpdir = "$ARGV[0]$locbkpdir";
    71 die "No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1]));
     71die "ERROR: No CONF_DIR parameter" if ((not defined $ARGV[1]) || (! -d $ARGV[1]));
    7272my $confdir = "$ARGV[1]";
    7373
    74 die "You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
     74die "ERROR: You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
    7575
    7676mkdir $bkpdir,0755 if (! -d $bkpdir) ;
    77 open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
     77open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "ERROR: You need /usr/sbin/dmidecode for mindi hardware support";
    7878while (<SYSTEM>) {
    7979    next if (/^#/);
     
    9090    print "INFO: You can install SDR packages to benefit from mindi's enhanced ProLiant support\n";
    9191    print "INFO: Get them from http://downloads.linux.hpe.com/SDR/\n";
    92     open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
     92    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "ERROR: Unable to open $confdir/deplist.d/ProLiant.conf";
    9393    # generate a list of what need to be put on the backup media
    94     open(TOOLS,"> $bkpdir/../tools.files") || die "Unable to open $bkpdir/../tools.files";
     94    open(TOOLS,"> $bkpdir/../tools.files") || die "ERROR: Unable to open $bkpdir/../tools.files";
    9595    # generate a script that will be launched at rstore time to perform the HW setup
    96     open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "Unable to open $bkpdir/../mindi-rsthw";
     96    open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "ERROR: Unable to open $bkpdir/../mindi-rsthw";
    9797    print SCRIPT  << 'EOF';
    9898#!/bin/bash
  • branches/3.3/mindi/mindi-hpsa

    r3530 r3684  
    1717my $productname = undef;
    1818
    19 die "You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
     19die "ERROR: You need dmidecode for Hardware support\n" if (! -x "/usr/sbin/dmidecode");
    2020
    2121mkdir $bkpdir,0755 if (! -d $bkpdir) ;
    22 open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
     22open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' 2> /dev/null |") || die "ERROR: You need /usr/sbin/dmidecode for mindi hardware support";
    2323while (<SYSTEM>) {
    2424    next if (/^#/);
     
    3535    print "You can install SDR packages to benefit from mindi's enhanced ProLiant support\n";
    3636    print "Get them from http://downloads.linux.hpe.com/SDR/\n";
    37     open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "Unable to open $confdir/deplist.d/ProLiant.conf";
     37    open(PROLIANT,"$confdir/deplist.d/ProLiant.conf") || die "ERROR: Unable to open $confdir/deplist.d/ProLiant.conf";
    3838    # generate a list of what need to be put on the backup media
    39     open(TOOLS,"> $bkpdir/../tools.files") || die "Unable to open $bkpdir/../tools.files";
     39    open(TOOLS,"> $bkpdir/../tools.files") || die "ERROR: Unable to open $bkpdir/../tools.files";
    4040    # generate a script that will be launched at rstore time to perform the HW setup
    41     open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "Unable to open $bkpdir/../mindi-rsthw";
     41    open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "ERROR: Unable to open $bkpdir/../mindi-rsthw";
    4242    print SCRIPT  << 'EOF';
    4343#!/bin/bash
  • branches/3.3/mindi/mr-parted2fdisk

    r3666 r3684  
    756756    # Skip 2 first lines
    757757    $d = <PARTED>;
     758    # Skip potential warnings first
     759    $d = <PARTED> if ($d =~ /^Warning:/);
    758760    if ($d !~ /^BYT/) {
    759761        die "Your $parted command doesn't behave correctly in machine readable mode";
Note: See TracChangeset for help on using the changeset viewer.