[Fai-commit] r2940 - trunk/debian

fai-repository at svn.debian.org fai-repository at svn.debian.org
Thu Oct 13 13:47:44 UTC 2005 

Author: lange
Date: 2005-10-13 13:47:44 +0000 (Thu, 13 Oct 2005)
New Revision: 2940

Added:
   trunk/debian/fai-nfsroot.postrm
   trunk/debian/fai-nfsroot.preinst
Modified:
   trunk/debian/control
   trunk/debian/docs
   trunk/debian/fai-client.dirs
   trunk/debian/fai-client.install
   trunk/debian/fai-nfsroot.dirs
   trunk/debian/fai-nfsroot.install
   trunk/debian/fai-server.dirs
   trunk/debian/rules
Log:
changes for additional binary packages


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/control	2005-10-13 13:47:44 UTC (rev 2940)
@@ -5,6 +5,17 @@
 Standards-Version: 3.6.1
 Build-Depends-Indep: debhelper (>= 4.1.16), debiandoc-sgml, tetex-bin, tetex-extra
 
+Package: fai-client
+Architecture: all
+Depends: perl, libapt-pkg-perl
+Description: Fully Automatic Installation client package
+ FAI is a non-interactive system to install a Debian GNU/Linux operating
+ system unattended on a PC cluster. You can take one or more virgin
+ PCs, turn on the power, and after a few minutes, Linux is installed,
+ configured, and running on the whole cluster, without any interaction
+ necessary.  Homepage: http://www.informatik.uni-koeln.de/fai
+ This package contains the software needed on the install client.
+
 Package: fai-doc
 Architecture: all
 Description: Documentation for FAI
@@ -24,20 +35,19 @@
  necessary.  Homepage: http://www.informatik.uni-koeln.de/fai
  This package is needed for setting up a FAI install server.
 
-Package: fai-client
+Package: fai-quickstart
 Architecture: all
-Depends: perl, libapt-pkg-perl
-Description: Fully Automatic Installation client package
- FAI is a non-interactive system to install a Debian GNU/Linux operating
- system unattended on a PC cluster. You can take one or more virgin
- PCs, turn on the power, and after a few minutes, Linux is installed,
- configured, and running on the whole cluster, without any interaction
- necessary.  Homepage: http://www.informatik.uni-koeln.de/fai
- This package contains the software needed on the install client.
+Depends: fai-server, dhcp3-server, nfs-server, syslinux, tftp-hpa
+Description: Fully Automatic Installation quickstart package
+ FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
+ systems. This package setups an install server with some basic
+ examples. It should be removed when creating your own config space. 
 
 Package: fai-nfsroot
 Architecture: all
 Depends: fai-client
 Description: Fully Automatic Installation nfsroot package
  FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
- systems. This package contains the software that is only needed in the FAI nfsroot.
+ systems. This package contains the software that is only needed in
+ the FAI nfsroot. Do not install this package on a normal machine.
+

Modified: trunk/debian/docs
===================================================================
--- trunk/debian/docs	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/docs	2005-10-13 13:47:44 UTC (rev 2940)
@@ -1,3 +1,5 @@
 README
 NEWS
 THANKS
+doc/FAQ
+doc/QUESTIONNAIRE

Modified: trunk/debian/fai-client.dirs
===================================================================
--- trunk/debian/fai-client.dirs	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-client.dirs	2005-10-13 13:47:44 UTC (rev 2940)
@@ -1 +1,2 @@
 usr/lib/fai
+usr/share/doc/fai-client

Modified: trunk/debian/fai-client.install
===================================================================
--- trunk/debian/fai-client.install	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-client.install	2005-10-13 13:47:44 UTC (rev 2940)
@@ -6,6 +6,7 @@
 usr/lib/fai/subroutines
 usr/lib/fai/subroutines-linux
 usr/lib/fai/updatebase
+usr/bin/device2grub
 usr/bin/fai-class
 usr/bin/fai-debconf
 usr/bin/fai-do-scripts

Modified: trunk/debian/fai-nfsroot.dirs
===================================================================
--- trunk/debian/fai-nfsroot.dirs	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-nfsroot.dirs	2005-10-13 13:47:44 UTC (rev 2940)
@@ -1,2 +1,4 @@
 etc/fai
+etc/dhcp3
+etc/apt.conf.d
 usr/lib/fai

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-nfsroot.install	2005-10-13 13:47:44 UTC (rev 2940)
@@ -1,6 +1,5 @@
 usr/sbin/faireboot
-usr/sbin/fai-start-stop-daemon
-usr/sbin/dhclient-script
+sbin/start-stop-daemon
 usr/lib/fai/create_ramdisk
 usr/lib/fai/create_resolv_conf
 usr/lib/fai/load_keymap_consolechars
@@ -8,6 +7,7 @@
 usr/lib/fai/fai-mount-disk
 usr/lib/fai/mount2dir
 usr/lib/fai/task_sysinfo
-etc/fai/apt.conf
-etc/fai/dhclient.conf
+etc/dhcp3/dhclient-script
+etc/dhcp3/dhclient.conf
+etc/apt.conf.d/90fai
 etc/modutils/fai_modules_off

Added: trunk/debian/fai-nfsroot.postrm
===================================================================
--- trunk/debian/fai-nfsroot.postrm	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-nfsroot.postrm	2005-10-13 13:47:44 UTC (rev 2940)
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ remove = "$1" ]; then
+    dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient-script
+    dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient.conf
+    dpkg-divert --package fai-nfsroot --remove --rename /etc/init.d/rcS
+    dpkg-divert --package fai-nfsroot --remove --rename /sbin/start-stop-daemon
+fi


Property changes on: trunk/debian/fai-nfsroot.postrm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/debian/fai-nfsroot.preinst
===================================================================
--- trunk/debian/fai-nfsroot.preinst	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-nfsroot.preinst	2005-10-13 13:47:44 UTC (rev 2940)
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient-script
+dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient.conf
+dpkg-divert --package fai-nfsroot --add --rename /etc/init.d/rcS
+dpkg-divert --package fai-nfsroot --add --rename /sbin/start-stop-daemon


Property changes on: trunk/debian/fai-nfsroot.preinst
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/debian/fai-server.dirs
===================================================================
--- trunk/debian/fai-server.dirs	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/fai-server.dirs	2005-10-13 13:47:44 UTC (rev 2940)
@@ -2,6 +2,4 @@
 etc/fai
 usr/bin
 usr/sbin
-usr/share/fai/etc
-usr/share/perl5/Debian
 boot/fai

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-10-10 07:55:50 UTC (rev 2939)
+++ trunk/debian/rules	2005-10-13 13:47:44 UTC (rev 2940)
@@ -42,14 +42,14 @@
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs
+	dh_installdocs -Nfai-server -Nfai-quickstart
 #	dh_installexamples
 #	dh_installmenu
 	dh_installman
 	dh_install --sourcedir=debian/tmp
 #	dh_installinfo
+	dh_link
 	dh_installchangelogs 
-#	dh_link
 	dh_compress -Xexamples -X.pdf
 	dh_fixperms -X make-fai-nfsroot.conf
 	chmod a+rx ${DOCDIR}/examples/*/class/[0-9][0-9]*
@@ -57,7 +57,7 @@
 	chmod a+rx ${DOCDIR}/examples/*/hooks/*
 	find ${DOCDIR}/examples/*/files -name postinst | xargs chmod a+x
 	chmod a+rx ${DOCDIR}/examples/utils/*
-	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' ${DESTDIR}/usr/share/doc/fai/README
+	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(shell pwd)/debian/fai-client/usr/share/doc/fai-client/README
 # You may want to make some executables suid here.
 	dh_installdeb
 	dh_gencontrol

More information about the Fai-commit mailing list