[Fai-commit] r5880 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-07-27 06:32:46 +0000 (Tue, 27 Jul 2010)
New Revision: 5880

Modified:
   branches/experimental/patches/ainsl_man-page-return-codes
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/dhcp-transition
   branches/experimental/patches/fai-chboot_mac-address
Log:
updated patches to match current trunk


Modified: branches/experimental/patches/ainsl_man-page-return-codes
===================================================================
--- branches/experimental/patches/ainsl_man-page-return-codes	2010-07-27 03:39:27 UTC (rev 5879)
+++ branches/experimental/patches/ainsl_man-page-return-codes	2010-07-27 06:32:46 UTC (rev 5880)
@@ -44,7 +44,7 @@
 ===================================================================
 --- trunk.orig/bin/ainsl
 +++ trunk/bin/ainsl	
-@@ -139,5 +139,5 @@
+@@ -136,5 +136,5 @@
  print "ainsl: appending to $filename: $line\n" if $verbose;
  exit 0 if $opt_n;
  open (INFILE, ">>$filename") or die "ainsl: can't open $filename for writing. $!";

Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2010-07-27 03:39:27 UTC (rev 5879)
+++ branches/experimental/patches/bugfix-479537	2010-07-27 06:32:46 UTC (rev 5880)
@@ -22,7 +22,7 @@
 ===================================================================
 --- trunk.orig/bin/install_packages
 +++ trunk/bin/install_packages	
-@@ -275,13 +275,21 @@
+@@ -274,13 +274,21 @@
        # by default no classes are listed after this command so doit
        $doit = 1;
        if ($cllist) {

Modified: branches/experimental/patches/dhcp-transition
===================================================================
--- branches/experimental/patches/dhcp-transition	2010-07-27 03:39:27 UTC (rev 5879)
+++ branches/experimental/patches/dhcp-transition	2010-07-27 06:32:46 UTC (rev 5880)
@@ -37,16 +37,16 @@
 ===================================================================
 --- trunk.orig/bin/dhcp-edit
 +++ trunk/bin/dhcp-edit	
-@@ -20,7 +20,7 @@
+@@ -19,7 +19,7 @@
+ # TODO
  # -q quiet: do not print error if host/mac entry not found, exit code 0
  
- $version="Version 1.2, 6-july-2010";
 -$dhcpdconf="/etc/dhcp3/dhcpd.conf";
 +$dhcpdconf=(-d "/etc/dhcp" ? "/etc/dhcp/dhcpd.conf" : "/etc/dhcp3/dhcpd.conf");
  
  $modified=0; # 1 if dhcpd.conf was modified
  our ($opt_p,$opt_d,$opt_h,$opt_n,$opt_r);
-@@ -150,7 +150,8 @@
+@@ -149,7 +149,8 @@
      return;
    }
  

Modified: branches/experimental/patches/fai-chboot_mac-address
===================================================================
--- branches/experimental/patches/fai-chboot_mac-address	2010-07-27 03:39:27 UTC (rev 5879)
+++ branches/experimental/patches/fai-chboot_mac-address	2010-07-27 06:32:46 UTC (rev 5880)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/bin/fai-chboot
 +++ trunk/bin/fai-chboot	
-@@ -56,6 +56,13 @@
+@@ -55,6 +55,13 @@
      return ip2hex($host);
    }
    return ('no IP','default') if ($host =~ /^default/);
@@ -20,7 +20,7 @@
  
    my $h = gethost($host);
    die "$0: unknown host: $host\n" unless $h;
-@@ -259,7 +266,7 @@
+@@ -252,7 +259,7 @@
    }
    open (FILE,"> $pxedir/$hex") or warn "$0 $@ $!";
    print FILE << "EOM";
@@ -29,7 +29,7 @@
  default fai-generated
  
  label fai-generated
-@@ -308,7 +315,7 @@
+@@ -301,7 +308,7 @@
    my ($srcfile, $pxedir, $desthex, $desthost, $ipadr) = @_;
    open (SOURCE, "$srcfile");
    open (DEST, ">$pxedir/$desthex") || die "Can't opendir $pxedir: $!";