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

[Michael Tautschnig]

Author: mt
Date: 2010-06-26 07:14:58 +0000 (Sat, 26 Jun 2010)
New Revision: 5819

Modified:
   branches/experimental/patches/fai-chboot_mac-address
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
Log:
updated patches for current trunk


Modified: branches/experimental/patches/fai-chboot_mac-address
===================================================================
--- branches/experimental/patches/fai-chboot_mac-address	2010-06-25 14:51:13 UTC (rev 5818)
+++ branches/experimental/patches/fai-chboot_mac-address	2010-06-26 07:14:58 UTC (rev 5819)
@@ -29,7 +29,7 @@
  default fai-generated
  
  label fai-generated
-@@ -307,7 +314,7 @@
+@@ -308,7 +315,7 @@
    my ($srcfile, $pxedir, $desthex, $desthost, $ipadr) = @_;
    open (SOURCE, "$srcfile");
    open (DEST, ">$pxedir/$desthex") || die "Can't opendir $pxedir: $!";
@@ -42,13 +42,6 @@
 ===================================================================
 --- trunk.orig/man/fai-chboot.8
 +++ trunk/man/fai-chboot.8	
-@@ -1,5 +1,5 @@
- .\"                                      Hey, EMACS: -*- nroff -*-
--.TH fai-chboot 8 "21 October 2009" "FAI 3.3"
-+.TH fai-chboot 8 "31 May 2010" "FAI 3.4"
- .\"
- .\" File Name macro.  This used to be `.PN', for Path Name,
- .\" but Sun doesn't seem to like that very much.
 @@ -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

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-06-25 14:51:13 UTC (rev 5818)
+++ branches/experimental/patches/grub-pc	2010-06-26 07:14:58 UTC (rev 5819)
@@ -12,7 +12,7 @@
 ===================================================================
 --- trunk.orig/Makefile
 +++ trunk/Makefile	
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
  	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
  	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
  	cp -a examples $(DOCDIR)

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2010-06-25 14:51:13 UTC (rev 5818)
+++ branches/experimental/patches/logtail	2010-06-26 07:14:58 UTC (rev 5819)
@@ -22,7 +22,7 @@
 +++ trunk/debian/control	
 @@ -14,6 +14,7 @@
  Architecture: all
- Depends: perl, file, libapt-pkg-perl, iproute, fai-setup-storage
+ Depends: perl, file, libapt-pkg-perl, iproute
  Recommends: debconf-utils, cfengine2
 +Suggests: logtail
  Conflicts: fai, fai-kernels