-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
tags 585063 + patch
tags 585063 + pending
thanks
Dear maintainer,
I've prepared an NMU for fai (versioned as 3.3.5+nmu1) and uploaded it
to DELAYED/5. Please feel free to tell me if I should delay it longer
or if you prefer upload it by yourself.
Regards.
- --
Mehdi Dogguy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJMPYhRAAoJEDO+GgqMLtj/vbkP/0T3n28V+aPeJK80dN4af8ZQ
PrHkX5tWxe+xEf0htoU5xc33+D8/1/S5HaEbaVMfiEG7vHa57c39nLkC7XtzSRhm
/9VnXqytwNg/nCTqZvcfLQ8gr5C7BLuEFpx1+X6LaugpmgrIpposfO6Vy5Le/6ur
DMOSLu5+83z9/IkiFoMN32/Ck+GWlLlDU5bTWAnofLwx0Mk43CyvKYeGbTVtPQkV
ZDv8re3zoeB9ZUsPWFHA+VAMVryArWjl7kkt1tUj/0VWPr4Jq88GKuqncdMjNNHi
g8ulztNSHfgEX3TeXTcyJEwLtL+2jSYBl0bcD4RuNeaRL98JwrYz46krZRFvDobL
xmoJU+UG/Ur/rtpZ4pSZw2Hb+nOOGs2U4j4zHw/dIlmOept+PlRjqu9wbKLzqQ/2
PYDegTume56JAVbISpyHv/+cgAZnqVkHd5Jn8mNgxfM8lYM+Pj2kWU9crR35nxHS
DD1o40qpq7T6QbBRjmfUuHPE7j2wGcBZNohcOFrrDObBqgpkVAPcXROwjqK0CyJ6
C9KcsDpCOMNlsEYxP7dESsZQl6ST+rt+fS3Hw3R5H7Kmy7R6q5ilcUwq0oOwHhhC
HQxbhwslTPoDKttY776EMFVK+Nrn1ztW8kgcz+w2zFEtPrSGAYPqIjLMw0y5kZOi
e8iwpfVJ/CPqOyd99jUa
=6kn8
-----END PGP SIGNATURE-----
commit 5ddc0d8256476384200f29d59b987218fd03cd92
Author: Mehdi Dogguy <me...@debian.org>
Date: Wed Jul 14 11:07:49 2010 +0200
DHCP v4 fix
diff --git a/Makefile b/Makefile
index 15e46e2..e05d4fb 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ veryclean: clean
$(MAKE) -f debian/rules clean
install:
- mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
+ mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp,apt/apt.conf.d}
mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
install man/* $(DESTDIR)/man
@@ -33,8 +33,8 @@ install:
cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
cd bin ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
install bin/fai-start-stop-daemon $(DESTDIR)/sbin
- install bin/dhclient-fai-script $(DESTDIR)/etc/dhcp3
- install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
+ install bin/dhclient-fai-script $(DESTDIR)/etc/dhcp
+ install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp
install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
install -m644 conf/fai.conf conf/menu.lst conf/live.conf $(DESTDIR)/etc/fai/
install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
diff --git a/debian/changelog b/debian/changelog
index 0d52908..1d03ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fai (3.3.5+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update DHCP paths for move configuration files (Closes: #585063).
+
+ -- Mehdi Dogguy <me...@debian.org> Wed, 14 Jul 2010 11:22:11 +0200
+
fai (3.3.5) unstable; urgency=high
[ Thomas Lange ]
diff --git a/debian/control b/debian/control
index 50489b5..deaef3d 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,7 @@ Description: Documentation for FAI
Package: fai-server
Architecture: all
Depends: fai-client, debootstrap
-Recommends: nfs-kernel-server, dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute
+Recommends: nfs-kernel-server, isc-dhcp-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, iproute
Suggests: debmirror, apt-move, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
Conflicts: fai
Replaces: fai
@@ -63,7 +63,7 @@ Description: Fully Automatic Installation server package
Package: fai-quickstart
Architecture: all
-Depends: fai-server, fai-doc, dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, apt-move, genisoimage, openbsd-inetd | inet-superserver
+Depends: fai-server, fai-doc, isc-dhcp-server, nfs-kernel-server, syslinux-common, tftpd-hpa, apt-move, genisoimage, openbsd-inetd | inet-superserver
Description: Fully Automatic Installation quickstart package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
@@ -74,8 +74,10 @@ Description: Fully Automatic Installation quickstart package
Package: fai-nfsroot
Architecture: all
+Pre-Depends: dpkg (>= 1.15.7.2)
Depends: fai-client, live-initramfs
Conflicts: fai, fai-kernels
+Breaks: dhcp3-client (<< 4.1.0-1)
Description: Fully Automatic Installation nfsroot package
FAI is a non-interactive system to install, customize and manage
Linux systems and software configurations on computers as well as
diff --git a/debian/fai-nfsroot.dirs b/debian/fai-nfsroot.dirs
index 1f0634e..3b819bf 100644
--- a/debian/fai-nfsroot.dirs
+++ b/debian/fai-nfsroot.dirs
@@ -1,6 +1,6 @@
etc/fai
etc/init
-etc/dhcp3
+etc/dhcp
etc/init.d
etc/apt/apt.conf.d
usr/lib/fai
diff --git a/debian/fai-nfsroot.install b/debian/fai-nfsroot.install
index 8b1491f..ac518bd 100644
--- a/debian/fai-nfsroot.install
+++ b/debian/fai-nfsroot.install
@@ -6,8 +6,8 @@ usr/lib/fai/load_keymap_consolechars
usr/lib/fai/fai-mount-disk
usr/lib/fai/mount2dir
usr/lib/fai/task_sysinfo
-etc/dhcp3/dhclient-fai-script
-etc/dhcp3/dhclient-fai.conf
+etc/dhcp/dhclient-fai-script
+etc/dhcp/dhclient-fai.conf
etc/apt/apt.conf.d/90fai
etc/init.d/fai-abort
etc/init/fai.conf
diff --git a/debian/fai-nfsroot.postinst b/debian/fai-nfsroot.postinst
index 8470259..64f9613 100755
--- a/debian/fai-nfsroot.postinst
+++ b/debian/fai-nfsroot.postinst
@@ -1,5 +1,11 @@
#!/bin/sh -e
+if dpkg-maintscript-helper supports mv_conffile; then
+ for file in dhclient-fai.conf dhclient-fai-script; do
+ dpkg-maintscript-helper mv_conffile /etc/dhcp3/$file /etc/dhcp/$file 3.3.5 -- "$@";
+ done
+fi
+
case "$1" in
configure)
update-alternatives --install /usr/sbin/policy-rc.d policy-rc.d \
diff --git a/debian/fai-nfsroot.postrm b/debian/fai-nfsroot.postrm
index 9d8a19b..b4fd32b 100755
--- a/debian/fai-nfsroot.postrm
+++ b/debian/fai-nfsroot.postrm
@@ -1,5 +1,11 @@
#!/bin/sh -e
+if dpkg-maintscript-helper supports mv_conffile; then
+ for file in dhclient-fai.conf dhclient-fai-script; do
+ dpkg-maintscript-helper mv_conffile /etc/dhcp3/$file /etc/dhcp/$file 3.3.5 -- "$@";
+ done
+fi
+
case "$1" in
remove)
rm /etc/init.d/rcS
diff --git a/debian/fai-nfsroot.preinst b/debian/fai-nfsroot.preinst
index b714919..b8cadb0 100755
--- a/debian/fai-nfsroot.preinst
+++ b/debian/fai-nfsroot.preinst
@@ -7,6 +7,12 @@ fi
dpkg-divert --package fai-nfsroot --add --rename /etc/init.d/rcS
+if dpkg-maintscript-helper supports mv_conffile; then
+ for file in dhclient-fai.conf dhclient-fai-script; do
+ dpkg-maintscript-helper mv_conffile /etc/dhcp3/$file /etc/dhcp/$file 3.3.5 -- "$@";
+ done
+fi
+
#DEBHELPER#
exit 0
diff --git a/doc/fai-guide.txt b/doc/fai-guide.txt
index 3398614..dafe21a 100644
--- a/doc/fai-guide.txt
+++ b/doc/fai-guide.txt
@@ -403,7 +403,7 @@ Initializing package states... Done
Reading task descriptions... Done
The following NEW packages will be installed:
- apt-move{a} dhcp3-server{a} fai-doc{a} fai-quickstart fai-server{a}
+ apt-move{a} isc-dhcp-server{a} fai-doc{a} fai-quickstart fai-server{a}
genisoimage{a} inetutils-inetd{a} nfs-kernel-server{a}
openssh-server{a} syslinux-common{a} tftpd-hpa{a}
0 packages upgraded, 11 newly installed, 0 to remove and 0 not upgraded.
@@ -610,12 +610,12 @@ daemon, which is available in the Debian package
First, install following additional needed packages:
----
-faiserver# apt-get install dhcp3-server syslinux-common tftpd-hpa
+faiserver# apt-get install isc-dhcp-server syslinux-common tftpd-hpa
----
Then set up the DHCP daemon. A sample configuration file can be found
in '/usr/share/doc/fai-doc/examples/etc/dhcpd.conf'. Copy this file to
-'/etc/dhcp3/dhcpd.conf'.
+'/etc/dhcp/dhcpd.conf'.
The install client then loads the pxelinux boot loader which receives
its configuration via TFTP from a file in the directory
@@ -712,7 +712,7 @@ network related data, which is used in almost all DHCP configurations.
If you make any changes to the DHCP daemon configuration, you must
restart the daemon.
- # /etc/init.d/dhcp3-server restart
+ # /etc/init.d/isc-dhcp-server restart
By default, the DHCP daemon writes its log files to
'/var/log/daemon.log'. The command `fai-chboot(8)` is used for
@@ -1954,7 +1954,7 @@ archive via HTTP and extract it into a new RAM disk, then redefine
If the client can't successfully boot from the network card, use
`tcpdump(8)` to look for Ethernet packets between the install server
and the client. Search also for entries in several log files made by
-`tftpd(8)` and `dhcpd3(8)` :
+`tftpd(8)` and `dhcpd(8)` :
----
faiserver$ egrep "tftpd|dhcpd" /var/log/*
@@ -2171,7 +2171,7 @@ netgroup _...@faiclients_ read only. Here's the line for '/etc/exports':
Add the following packages to the install server:
----
-nucleus:/# apt-get install ntp tftpd-hpa dhcp3-server \
+nucleus:/# apt-get install ntp tftpd-hpa isc-dhcp-server \
nfs-kernel-server etherwake fai
nucleus:/# tasksel -q -n install dns-server
nucleus:/# apt-get dselect-upgrade
@@ -2182,7 +2182,7 @@ Configure NTP so that the master server will have the correct system time.
It's very important to use the internal network name +atom00+ for the
master server (not the external name +nucleus+) in
-'/etc/dhcp3/dhcpd.conf' and 'make-fai-nfsroot.conf'. Replace the
+'/etc/dhcp/dhcpd.conf' and 'make-fai-nfsroot.conf'. Replace the
strings FAISERVER with _atom00_ and uncomment the following line in
'make-fai-nfsroot.conf' so the Beowulf nodes can use the name for
connecting to their master server.
diff --git a/examples/simple/package_config/DEFAULT b/examples/simple/package_config/DEFAULT
index 0b1a50c..76266bc 100644
--- a/examples/simple/package_config/DEFAULT
+++ b/examples/simple/package_config/DEFAULT
@@ -14,7 +14,7 @@ PACKAGES aptitude XEN
xen-linux-system-2.6.26-2-xen-amd64
PACKAGES aptitude DHCPC
-dhcp3-client
+isc-dhcp-client
PACKAGES aptitude GRUB
grub lilo-
diff --git a/examples/simple/scripts/FAISERVER/10-conffiles b/examples/simple/scripts/FAISERVER/10-conffiles
index 07e1128..e8362c0 100755
--- a/examples/simple/scripts/FAISERVER/10-conffiles
+++ b/examples/simple/scripts/FAISERVER/10-conffiles
@@ -1,6 +1,6 @@
#! /bin/bash
-fcopy -Bv /etc/dhcp3/dhcpd.conf /etc/default/tftpd-hpa # not needed /etc/apache2/conf.d
+fcopy -Bv /etc/dhcp/dhcpd.conf /etc/default/tftpd-hpa # not needed /etc/apache2/conf.d
fcopy -Bvr /etc/fai
fcopy /etc/apt-proxy/apt-proxy-v2.conf /etc/fai/apt/sources.list
diff --git a/lib/get-boot-info b/lib/get-boot-info
index ce2092c..d9fa684 100644
--- a/lib/get-boot-info
+++ b/lib/get-boot-info
@@ -62,7 +62,7 @@ netdevice_info() {
get_dhcp_info() {
boot=1
- dhclient -lf /dev/null -cf /etc/dhcp3/dhclient-fai.conf -sf /etc/dhcp3/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
+ dhclient -lf /dev/null -cf /etc/dhcp/dhclient-fai.conf -sf /etc/dhcp/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
killall dhclient
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
