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

Michael Tautschnig mt at alioth.debian.org
Thu Jul 29 15:42:56 UTC 2010 

Author: mt
Date: 2010-07-29 15:42:56 +0000 (Thu, 29 Jul 2010)
New Revision: 5906

Removed:
   branches/experimental/patches/fai-chboot_mac-address
Modified:
   branches/experimental/patches/bugfix-479537
   branches/experimental/patches/dhcp-transition
   branches/experimental/patches/fix-eval_cmdline
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
   branches/experimental/patches/series
Log:
Updated patches to match current trunk


Modified: branches/experimental/patches/bugfix-479537
===================================================================
--- branches/experimental/patches/bugfix-479537	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/bugfix-479537	2010-07-29 15:42:56 UTC (rev 5906)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/debian/NEWS
 +++ trunk/debian/NEWS	
-@@ -12,6 +12,9 @@
+@@ -13,6 +13,9 @@
    - files named package_config/*.asc are added to the list of apt keys
    - cvs, bootpc, expect and mdetect are not installed by default into the
      nfsroot

Modified: branches/experimental/patches/dhcp-transition
===================================================================
--- branches/experimental/patches/dhcp-transition	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/dhcp-transition	2010-07-29 15:42:56 UTC (rev 5906)
@@ -20,7 +20,7 @@
 -	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
 +	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,apt/apt.conf.d}
  	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
- 	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
+ 	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps/small,setup-storage}
  	install man/* $(DESTDIR)/man
 @@ -34,8 +34,8 @@
  	cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
@@ -31,7 +31,7 @@
 +	install bin/dhclient-fai-script  $(DESTDIR)/usr/share/fai
 +	install -m644 conf/dhclient-fai.conf $(DESTDIR)/usr/share/fai
  	install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
- 	install -m644 conf/fai.conf conf/menu.lst conf/live.conf $(DESTDIR)/etc/fai/
+ 	cd conf ; install -m644 fai.conf menu.lst grub.cfg live.conf $(DESTDIR)/etc/fai/
  	install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
 Index: trunk/bin/dhcp-edit
 ===================================================================

Deleted: branches/experimental/patches/fai-chboot_mac-address
===================================================================
--- branches/experimental/patches/fai-chboot_mac-address	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/fai-chboot_mac-address	2010-07-29 15:42:56 UTC (rev 5906)
@@ -1,54 +0,0 @@
-2010-05-31  Michael Tautschnig  <mt at debian.org>
-
-	* fai-chboot, fai-chboot.8: Also accept mac addresses as host specifications
-		(thanks Torge Gipp <post at torge-gipp.de>)
-Index: trunk/bin/fai-chboot
-===================================================================
---- trunk.orig/bin/fai-chboot
-+++ trunk/bin/fai-chboot	
-@@ -55,6 +55,13 @@
-     return ip2hex($host);
-   }
-   return ('no IP','default') if ($host =~ /^default/);
-+  # mac address using : or - as separators
-+  if ($host =~ /^([[:xdigit:]]{2}[:-]){5}[[:xdigit:]]{2}$/) { # Pattern-Matching
-+	  $host = lc $host; # Lowercase for pxe-file
-+	  my @nums = split /[:-]/, $host;
-+	  $mac = "01-$nums[0]-$nums[1]-$nums[2]-$nums[3]-$nums[4]-$nums[5]"; #
-+	  return ($host,$mac);
-+  }
- 
-   my $h = gethost($host);
-   die "$0: unknown host: $host\n" unless $h;
-@@ -252,7 +259,7 @@
-   }
-   open (FILE,"> $pxedir/$hex") or warn "$0 $@ $!";
-   print FILE << "EOM";
--# generated by fai-chboot for host $host with IP $ipadr
-+# generated by fai-chboot for host $host with address $ipadr
- default fai-generated
- 
- label fai-generated
-@@ -301,7 +308,7 @@
-   my ($srcfile, $pxedir, $desthex, $desthost, $ipadr) = @_;
-   open (SOURCE, "$srcfile");
-   open (DEST, ">$pxedir/$desthex") || die "Can't opendir $pxedir: $!";
--  print DEST "# template generated by fai-chboot for host $desthost with IP $ipadr from source $srcfile\n";
-+  print DEST "# template generated by fai-chboot for host $desthost with address $ipadr from source $srcfile\n";
-   while (<SOURCE>) {
-     print DEST $_;
-   }
-Index: trunk/man/fai-chboot.8
-===================================================================
---- trunk.orig/man/fai-chboot.8
-+++ trunk/man/fai-chboot.8	
-@@ -40,7 +40,8 @@
- additional kernel parameters and define some FAI specific flags. For
- each host one configuration file is created. The file name of the
- configuration file is its IP address in upper case hexadecimal. HOST
--can be a host name, an IP address or the keyword "default".
-+can be a host name, an IP address, a MAC address (hexadecimal words
-+separated by ":" or "\-"), or the keyword "default".
- 
- .SH OPTIONS
- .TP

Modified: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/fix-eval_cmdline	2010-07-29 15:42:56 UTC (rev 5906)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/lib/subroutines
 +++ trunk/lib/subroutines	
-@@ -661,18 +661,22 @@
+@@ -665,18 +665,22 @@
      echo -n "Kernel currently running: "
      uname -rsmo
      echo -n "Kernel parameters: "; cat /proc/cmdline

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/grub-pc	2010-07-29 15:42:56 UTC (rev 5906)
@@ -12,8 +12,8 @@
 ===================================================================
 --- trunk.orig/Makefile
 +++ trunk/Makefile	
-@@ -48,6 +48,7 @@
- 	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
+@@ -49,6 +49,7 @@
+ 	cp -a pixmaps/small/*.gif $(DESTDIR)/usr/share/fai/pixmaps/small
  	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
  	cp -a examples $(DOCDIR)
 +	chmod -R a+x $(DOCDIR)/examples/simple/scripts/

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/logtail	2010-07-29 15:42:56 UTC (rev 5906)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/bin/fai
 +++ trunk/bin/fai	
-@@ -293,6 +293,9 @@
+@@ -278,6 +278,9 @@
      mkdir -p $LOGDIR
      ln -snf $action-$fai_rundate $LOGDIR/../last-$action
      ln -snf $action-$fai_rundate $LOGDIR/../last
@@ -14,8 +14,8 @@
 +      logtail -f /var/log/kern.log -o /var/run/fai/kern.log.offset > /dev/null
 +    fi
  fi
- chown root $LOGDIR
- chgrp adm  $LOGDIR
+ chown root:adm $LOGDIR
+ chmod 0750 $LOGDIR
 Index: trunk/debian/control
 ===================================================================
 --- trunk.orig/debian/control
@@ -44,8 +44,8 @@
 +    fi
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- jobsrunning() {
-@@ -436,6 +440,7 @@
+ umount_csspace() {
+@@ -445,6 +449,7 @@
  task_savelog() {
  
      mkdir -p $FAI_ROOT/var/{lib,log}/fai

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-07-29 15:01:17 UTC (rev 5905)
+++ branches/experimental/patches/series	2010-07-29 15:42:56 UTC (rev 5906)
@@ -19,7 +19,6 @@
 setup-storage_tmpfs
 setup-storage_external-journal
 setup-storage_cciss-bugfix
-fai-chboot_mac-address
 ainsl_man-page-return-codes
 setup-storage_better-parser-errors
 setup-storage_extended-is-not-last

More information about the Fai-commit mailing list