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

[Michael Tautschnig]

Author: mt
Date: 2011-01-18 21:54:39 +0000 (Tue, 18 Jan 2011)
New Revision: 6266

Modified:
   branches/experimental/patches/bugfix-498412
   branches/experimental/patches/grub-pc
Log:
Updated patches to match current trunk


Modified: branches/experimental/patches/bugfix-498412
===================================================================
--- branches/experimental/patches/bugfix-498412	2011-01-12 14:13:03 UTC (rev 6265)
+++ branches/experimental/patches/bugfix-498412	2011-01-18 21:54:39 UTC (rev 6266)
@@ -13,9 +13,9 @@
 -USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl faimond-gui
 +USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl faimond-gui fai-deps
  
- # do not include .svn dir and setup-storage subdir
- libfiles=$(patsubst lib/setup-storage,,$(wildcard lib/[a-z]*))
-@@ -28,6 +28,7 @@
+ # for syntax checks
+ BASH_SCRIPTS = lib/fai-divert lib/fai-mount-disk lib/fai-savelog lib/fai-vol_id lib/get-boot-info lib/get-config-dir lib/get-config-dir-cvs lib/get-config-dir-file lib/get-config-dir-git lib/get-config-dir-hg lib/get-config-dir-nfs lib/get-config-dir-svn lib/mkramdisk lib/mount2dir lib/prcopyleft lib/subroutines lib/task_sysinfo lib/updatebase
+@@ -70,6 +70,7 @@
  	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps/small,setup-storage}
  	install man/* $(DESTDIR)/man
  	pod2man -c '' -r '' -s8 bin/dhcp-edit > $(DESTDIR)/man/dhcp-edit.8

Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2011-01-12 14:13:03 UTC (rev 6265)
+++ branches/experimental/patches/grub-pc	2011-01-18 21:54:39 UTC (rev 6266)
@@ -7,7 +7,7 @@
 ===================================================================
 --- trunk.orig/Makefile
 +++ trunk/Makefile	
-@@ -48,6 +48,7 @@
+@@ -90,6 +90,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)