[Fai-commit] r2937 - in trunk: . debian
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Sun Oct 9 11:44:17 UTC 2005
Author: lange
Date: 2005-10-09 11:44:14 +0000 (Sun, 09 Oct 2005)
New Revision: 2937
Added:
trunk/debian/fai-client.dirs
trunk/debian/fai-client.install
trunk/debian/fai-client.manpages
trunk/debian/fai-server.dirs
trunk/debian/fai-server.install
trunk/debian/fai-server.manpages
trunk/debian/fai-server.postinst
trunk/debian/fai-server.postrm
trunk/debian/fai-server.preinst
trunk/debian/fai-server.prerm
Removed:
trunk/debian/fai.dirs
trunk/debian/fai.postinst
trunk/debian/fai.postrm
trunk/debian/fai.preinst
trunk/debian/fai.prerm
Modified:
trunk/Makefile
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
Log:
remove package fai, add package fai-server and fai-client
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/Makefile 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,16 +1,14 @@
include VERSION
-DESTDIR=$(shell pwd)/debian/fai
+DESTDIR=$(shell pwd)/debian/tmp
DEB_HOST_ARCH=$(MACHTYPE)
export DOCDIR = $(shell pwd)/debian/fai-doc/usr/share/doc/fai-doc
LIBDIR = $(DESTDIR)/usr/lib/fai
-SHAREDIR = $(DESTDIR)/usr/share/fai
SCRIPTSDIR = $(LIBDIR)/sbin
-SCRIPTS = setup_harddisks faireboot dhclient-perl dhclient-script
-USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai
-SBIN= fai-start-stop-daemon
+SCRIPTS = dhclient-script
+USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot fai-start-stop-daemon dhclient-perl
USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf
-CONFDIR= $(SHAREDIR)/etc
+CONFDIR= $(SHAREDIR)/usr/share/fai/etc
CONFFILES= apt.conf dhclient.conf fai_modules_off
ADEXAMPLE=$(DOCDIR)/examples/advanced
SIEXAMPLE=$(DOCDIR)/examples/simple
@@ -30,18 +28,17 @@
$(MAKE) -f debian/rules clean
install:
+ mkdir -p $(DESTDIR)/man $(DESTDIR)/etc/fai
+ mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai
+ install man/* $(DESTDIR)/man
$(MAKE) -C doc install
-install -m755 $(libfiles) $(LIBDIR)
- -install -m755 scripts/device2grub $(LIBDIR)
- cd scripts ; install $(SBIN) $(DESTDIR)/sbin
cd scripts ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
cd scripts ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
- cd scripts ; install $(SCRIPTS) $(SCRIPTSDIR)
- install -m755 share/subroutines* $(SHAREDIR)
+# cd scripts ; install $(SCRIPTS) $(SCRIPTSDIR)
install -m644 share/Fai.pm $(DESTDIR)/usr/share/perl5/Debian
- cd conf ; install -m644 $(CONFFILES) $(CONFDIR)
- install -m644 conf/menu.lst conf/sources.list $(DESTDIR)/etc/fai/
- install -m644 conf/fai.conf conf/sources.list $(DESTDIR)/etc/fai/
+# cd conf ; install -m644 $(CONFFILES) $(CONFDIR)
+ install -m644 conf/fai.conf conf/sources.list conf/menu.lst $(DESTDIR)/etc/fai/
install -m600 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
perl -pi -e 's/_KERNELVERSION_/$(KERNELVERSION)/' $(KVERSION_FILES)
perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/changelog 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,6 +1,6 @@
fai (2.9) unstable; urgency=low
- * splitting binary package in fai and fai-doc
+ * splitting binary package fai into fai-server, fai-client, fai-doc
-- Thomas Lange <lange at debian.org> Sat, 8 Oct 2005 21:28:29 +0200
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/control 2005-10-09 11:44:14 UTC (rev 2937)
@@ -5,20 +5,32 @@
Standards-Version: 3.6.1
Build-Depends-Indep: debhelper (>= 4.1.16), debiandoc-sgml, tetex-bin, tetex-extra
-Package: fai
+Package: fai-doc
Architecture: all
-Depends: perl, libapt-pkg-perl
+Description: Documentation for FAI
+ FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
+ systems. This is the documentation for FAI in various formats.
+
+Package: fai-server
+Architecture: all
+Depends: fai-client
Recommends: debootstrap, nfs-kernel-server | nfs-server, fai-kernels, dhcp3-server | bootp, tftpd-hpa | tftpd, rsh-server, wget, syslinux
Suggests: ssh, debmirror, mknbi, apt-move, mkinitrd-cd, grub
-Description: Fully Automatic Installation
+Description: Fully Automatic Installation server 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 is needed for setting up a FAI install server.
-Package: fai-doc
+Package: fai-client
Architecture: all
-Description: Documentation for FAI
- FAI is a tool for doing Fully Automatic Installation of Debian(-based) Linux
- systems. This is the documentation for FAI in various formats.
+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.
Added: trunk/debian/fai-client.dirs
===================================================================
--- trunk/debian/fai-client.dirs 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-client.dirs 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1 @@
+usr/lib/fai
Added: trunk/debian/fai-client.install
===================================================================
--- trunk/debian/fai-client.install 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-client.install 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1,16 @@
+usr/lib/fai/check_status
+usr/lib/fai/fai-savelog
+usr/lib/fai/fai-savelog-ftp
+usr/lib/fai/get-boot-info
+usr/lib/fai/list_disks
+usr/lib/fai/subroutines
+usr/lib/fai/subroutines-linux
+usr/lib/fai/updatebase
+usr/bin/fai-class
+usr/bin/fai-debconf
+usr/bin/fai-do-scripts
+usr/sbin/fai
+usr/sbin/fcopy
+usr/sbin/ftar
+usr/sbin/install_packages
+usr/sbin/setup_harddisks
Added: trunk/debian/fai-client.manpages
===================================================================
--- trunk/debian/fai-client.manpages 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-client.manpages 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1,7 @@
+debian/tmp/man/fai.8
+debian/tmp/man/fcopy.8
+debian/tmp/man/ftar.8
+debian/tmp/man/install_packages.8
+debian/tmp/man/fai-class.1
+debian/tmp/man/fai-debconf.1
+debian/tmp/man/fai-do-scripts.1
Added: trunk/debian/fai-server.dirs
===================================================================
--- trunk/debian/fai-server.dirs 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-server.dirs 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1,7 @@
+var/run/fai/make-fai-nfsroot
+etc/fai
+usr/bin
+usr/sbin
+usr/share/fai/etc
+usr/share/perl5/Debian
+boot/fai
Added: trunk/debian/fai-server.install
===================================================================
--- trunk/debian/fai-server.install 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-server.install 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1,10 @@
+usr/sbin/fai-cd
+usr/sbin/fai-chboot
+usr/sbin/fai-setup
+usr/sbin/faimond
+usr/sbin/make-fai-nfsroot
+usr/sbin/make-fai-bootfloppy
+usr/bin/fai-mirror
+etc/fai/menu.lst
+etc/fai/fai.conf
+etc/fai/make-fai-nfsroot.conf
Added: trunk/debian/fai-server.manpages
===================================================================
--- trunk/debian/fai-server.manpages 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai-server.manpages 2005-10-09 11:44:14 UTC (rev 2937)
@@ -0,0 +1,7 @@
+debian/tmp/man/fai-cd.8
+debian/tmp/man/fai-chboot.8
+debian/tmp/man/fai-mirror.1
+debian/tmp/man/fai-setup.8
+debian/tmp/man/faimond.8
+debian/tmp/man/make-fai-nfsroot.8
+debian/tmp/man/make-fai-bootfloppy.8
Copied: trunk/debian/fai-server.postinst (from rev 2932, trunk/debian/fai.postinst)
Copied: trunk/debian/fai-server.postrm (from rev 2932, trunk/debian/fai.postrm)
Copied: trunk/debian/fai-server.preinst (from rev 2932, trunk/debian/fai.preinst)
Copied: trunk/debian/fai-server.prerm (from rev 2932, trunk/debian/fai.prerm)
Deleted: trunk/debian/fai.dirs
===================================================================
--- trunk/debian/fai.dirs 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai.dirs 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,10 +0,0 @@
-var/run/fai/make-fai-nfsroot
-etc/fai
-sbin
-usr/bin
-usr/sbin
-usr/share/fai/etc
-usr/lib/fai/sbin
-usr/lib/fai/nfsroot
-usr/share/perl5/Debian
-boot/fai
Deleted: trunk/debian/fai.postinst
===================================================================
--- trunk/debian/fai.postinst 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai.postinst 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-# $Id $
-#*********************************************************************
-# postinst -- setup fai
-#
-# This script is part of FAI (Fully Automatic Installation)
-# Copyright (c) 2000-2005 by Thomas Lange, Universitaet zu Koeln
-#*********************************************************************
-#
-# see: dh_installdeb(1)
-
-set -e
-
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-
-case "$1" in
- configure)
-
- echo "Now edit fai.conf, make-fai-nfsroot.conf and sources.list in /etc/fai and call fai-setup."
- echo "Especially, you'll have to replace the placeholder INSTALLSERVER in /etc/fai/fai.conf."
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/debian/fai.postrm
===================================================================
--- trunk/debian/fai.postrm 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai.postrm 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-# postrm script for fai
-
-
-set -e
-
-case "$1" in
- purge)
- rm -rf /boot/fai /var/run/fai
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/debian/fai.preinst
===================================================================
--- trunk/debian/fai.preinst 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai.preinst 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,46 +0,0 @@
-#! /bin/sh
-# preinst script for fai
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
- upgrade)
-
- if [ -e /etc/fai.conf -a ! -e /etc/fai/fai.conf ]; then
- echo "Moving old /etc/fai.conf to new location /etc/fai/fai.conf"
- mkdir /etc/fai
- cp -p /etc/fai.conf /etc/fai/fai.conf
- fi
-
- ;;
-
- abort-upgrade)
- rm -f /etc/fai/fai.conf
- ;;
-
- install) ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: trunk/debian/fai.prerm
===================================================================
--- trunk/debian/fai.prerm 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/fai.prerm 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,68 +0,0 @@
-#! /bin/sh
-
-# $Id$
-#
-# prerm script for fai
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-
-# nothing to do during upgrade
-case "$1" in
- upgrade) exit 0 ;;
-esac
-
-. /etc/fai/fai.conf
-. /etc/fai/make-fai-nfsroot.conf
-
-test -f /etc/init.d/nfs-kernel-server && nfsserver=nfs-kernel-server
-test -f /etc/init.d/nfs-user-server && nfsserver=nfs-user-server
-
-case "$1" in
- upgrade) exit 0 ;;
-
- remove|deconfigure)
-
- if [ -z "$NFSROOT" ]; then
- echo "\$NFSROOT is not set. Please check your settings in fai.conf."
- exit 4
- fi
- echo "WARNING: removing NFSROOT $NFSROOT"
- sleep 2
- rm -rf $NFSROOT || true
-
- perl -ni.bak -e "print unless m#^$FAI_CONFIGDIR\s|^$NFSROOT\s#" /etc/exports
- [ -n "$nfsserver" ] && /etc/init.d/$nfsserver reload || true
-
- rmdir $FAI_CONFIGDIR || true
-
- [ -f /home/$LOGUSER/.account_created_by_fai_package ] && userdel -r $LOGUSER
-
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-10-09 11:30:01 UTC (rev 2936)
+++ trunk/debian/rules 2005-10-09 11:44:14 UTC (rev 2937)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DESTDIR=`pwd`/debian/fai
+DESTDIR=`pwd`/debian/tmp
SHAREDIR = $(DESTDIR)/usr/share/fai
DOCDIR=`pwd`/debian/fai-doc/usr/share/doc/fai-doc
@@ -8,7 +8,7 @@
export DH_ALWAYS_EXCLUDE=CVS:.svn
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
include VERSION
@@ -45,7 +45,8 @@
dh_installdocs
# dh_installexamples
# dh_installmenu
- dh_installman man/*.[1-9]
+ dh_installman
+ dh_install --sourcedir=debian/tmp
# dh_installinfo
dh_installchangelogs
# dh_link
More information about the Fai-commit
mailing list