pf-tools commit: r592 [ccaillet-guest] - in /trunk: Makefile debian/changelog templates/ templates/debian-installer.pxe templates/pftools.pxe

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Thu Apr 17 12:13:04 2008
New Revision: 592

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=592
Log:
* Fixing Makefile for PXE template files install and installers install

Added:
    trunk/templates/
    trunk/templates/debian-installer.pxe
    trunk/templates/pftools.pxe
Modified:
    trunk/Makefile
    trunk/debian/changelog

Modified: trunk/Makefile
URL: http://svn.debian.org/wsvn/pf-tools/trunk/Makefile?rev=592&op=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Apr 17 12:13:04 2008
@@ -4,7 +4,8 @@
 SBIN_DIR=$(DESTDIR)/usr/sbin
 FILTERS_DIR=$(DESTDIR)/usr/sbin
 CONF_DIR=$(DESTDIR)/etc
-INSTALLERS_DIR=$(DESTDIR)/usr/local/share/pf-tools
+TPL_DIR=$(DESTDIR)/usr/share/pf-tools/pxetemplates
+INSTALLERS_DIR=$(DESTDIR)/usr/share/pf-tools
 
 SBIN=sbin/*
 FILTERS=filters/*
@@ -12,6 +13,7 @@
 TOOLS=tools/*
 INSTALLERS=installers/*
 CONF=conf/*
+TPL=templates/*
 
 
 SBIN_HOST=umlaunch pflaunch dumpiplist.pl bridge.sh
@@ -48,6 +50,10 @@
 	mkdir -p $(FILTERS_DIR)
 	install --owner=root --group=root --mode=0755 $(FILTERS) $(FILTERS_DIR)
 	
+	# PFTools PXE template files
+	mkdir -p $(TPL_DIR)
+	install -o root -g root -m 600 $(TPL) $(TPL_DIR)
+
 	# PFTools Config file
 	mkdir -p $(CONF_DIR)
 	install -o root -g root -m 600 $(CONF) $(CONF_DIR)/pf-tools.conf.new

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=592&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Apr 17 12:13:04 2008
@@ -46,6 +46,7 @@
   * Adding preseedfilename handler in mk_pxelinuxcfg for including it when
     debian-installer is used. Adding automated md5sum on this file
   * Fixing pxetemplate for debian-installer
+  * Fixing Makefile for PXE template files install and installers install
 
   [ Thomas Parmelan ]
   * lib-net: if no comment is specified in a zone, network or server
@@ -58,7 +59,7 @@
   * Merge the remaining changes from 0.32.47-1 and 0.32.48-1.
   * Bugfix for hosts without shortname definition.
 
- -- Christophe Caillet <quadchris at free.fr>  Thu, 17 Apr 2008 13:44:32 +0200
+ -- Christophe Caillet <quadchris at free.fr>  Thu, 17 Apr 2008 14:03:17 +0200
 
 pf-tools (0.32.48-1) unstable; urgency=low
 

Added: trunk/templates/debian-installer.pxe
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/debian-installer.pxe?rev=592&op=file
==============================================================================
--- trunk/templates/debian-installer.pxe (added)
+++ trunk/templates/debian-installer.pxe Thu Apr 17 12:13:04 2008
@@ -1,0 +1,15 @@
+SERIAL 0 %SERIAL_SPEED% 0
+DISPLAY debian-installer/i386/boot-screens/myboot.txt
+
+DEFAULT linux
+
+LABEL install
+	kernel %KERNEL%
+	append DEBCONF_PRIORITY=critical vga=normal auto=true initrd=%INITRD% url=%PRESEED_URL% url/checksum=%PRESEED_MD5% -- %CONSOLE% %CMDLINE%
+
+LABEL linux
+	kernel %KERNEL%
+	append vga=normal root=/dev/sda3 -- console=ttyS0,%SERIAL_SPEED%n8 %CMDLINE%
+
+PROMPT 1
+TIMEOUT 100

Added: trunk/templates/pftools.pxe
URL: http://svn.debian.org/wsvn/pf-tools/trunk/templates/pftools.pxe?rev=592&op=file
==============================================================================
--- trunk/templates/pftools.pxe (added)
+++ trunk/templates/pftools.pxe Thu Apr 17 12:13:04 2008
@@ -1,0 +1,3 @@
+serial 0 115200
+default %KERNEL% root=/dev/ram0 initrd=%INITRD% ramdisk_size=%RAMDISK_SIZE% init=/linuxrc %CONSOLE% %CMDLINE%
+