[Fai-commit] r5916 - in trunk: . bin debian doc lib
Thomas Lange
lange at alioth.debian.org
Fri Jul 30 14:27:57 UTC 2010
Author: lange
Date: 2010-07-30 14:27:56 +0000 (Fri, 30 Jul 2010)
New Revision: 5916
Modified:
trunk/Makefile
trunk/bin/dhcp-edit
trunk/debian/changelog
trunk/debian/control
trunk/debian/fai-nfsroot.dirs
trunk/debian/fai-nfsroot.install
trunk/doc/fai-guide.txt
trunk/lib/get-boot-info
Log:
* Makefile, fai-nfsroot.dirs, fai-nfsroot.install, get-boot-info:
Install dhclient-fai.conf and dhclient-fai-script into /usr/share/fai
instead of /etc/dhcp3 (closes: #585063).
* dhcp-edit, control: Updated to work with isc-dhcp-server or
dhcp3-server, whichever is available.
* fai-guide.txt: Updated to isc-dhcp-server.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/Makefile 2010-07-30 14:27:56 UTC (rev 5916)
@@ -23,7 +23,7 @@
$(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,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/small,setup-storage}
install man/* $(DESTDIR)/man
@@ -33,8 +33,8 @@
install lib/setup-storage/* $(SHAREDIR)/setup-storage
cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
cd bin ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
- install bin/dhclient-fai-script $(DESTDIR)/etc/dhcp3
- install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
+ install bin/dhclient-fai-script $(DESTDIR)/usr/share/fai
+ install -m644 conf/dhclient-fai.conf $(DESTDIR)/usr/share/fai
install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
cd conf ; install -m644 fai.conf menu.lst grub.cfg live.conf $(DESTDIR)/etc/fai/
install -m644 conf/make-fai-nfsroot.conf $(DESTDIR)/etc/fai/
Modified: trunk/bin/dhcp-edit
===================================================================
--- trunk/bin/dhcp-edit 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/bin/dhcp-edit 2010-07-30 14:27:56 UTC (rev 5916)
@@ -19,7 +19,7 @@
# TODO
# -q quiet: do not print error if host/mac entry not found, exit code 0
-$dhcpdconf="/etc/dhcp3/dhcpd.conf";
+$dhcpdconf=(-d "/etc/dhcp") ? "/etc/dhcp/dhcpd.conf" : "/etc/dhcp3/dhcpd.conf";
$modified=0; # 1 if dhcpd.conf was modified
our ($opt_p,$opt_d,$opt_h,$opt_n,$opt_r);
@@ -149,7 +149,8 @@
return;
}
- print qx#/etc/init.d/dhcp3-server restart#
+ (-x "/etc/init.d/isc-dhcp-server") and print qx#/etc/init.d/isc-dhcp-server# or
+ print qx#/etc/init.d/dhcp3-server restart#;
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/debian/changelog 2010-07-30 14:27:56 UTC (rev 5916)
@@ -1,4 +1,4 @@
-fai (3.4~beta15) unstable; urgency=low
+fai (3.4~beta16) unstable; urgency=low
[ Thomas Lange ]
* get-config-dir-http: new script to get a tarball of the config space
@@ -99,7 +99,7 @@
* make-fai-nfsroot: remove diversion of discover-modprobe
* make-fai-nfsroot: die() subroutine now takes exit code, remove several
else branches
-
+
[ Michael Tautschnig ]
* setup-storage: Bumped version number to 1.3
* control: Move setup-storage to its own package (fai-setup-storage). Thanks
@@ -137,6 +137,12 @@
lead to immediate failure of setup-storage.
* setup-storage/Volumes.pm: Use absolute path names for devices in volume
groups, RAID volumes.
+ * Makefile, fai-nfsroot.dirs, fai-nfsroot.install, get-boot-info:
+ Install dhclient-fai.conf and dhclient-fai-script into /usr/share/fai
+ instead of /etc/dhcp3 (closes: #585063).
+ * dhcp-edit, control: Updated to work with isc-dhcp-server or
+ dhcp3-server, whichever is available.
+ * fai-guide.txt: Updated to isc-dhcp-server.
[ Michael Prokop ]
* subroutines, fai: make sure fai exits with the according return
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/debian/control 2010-07-30 14:27:56 UTC (rev 5916)
@@ -41,7 +41,7 @@
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, fai-setup-storage
+Recommends: nfs-kernel-server, isc-dhcp-server | dhcp3-server, tftpd-hpa | tftpd, openssh-server, openssh-client, syslinux-common, openbsd-inetd | inet-superserver, fai-setup-storage
Suggests: debmirror, reprepro, genisoimage, grub, aptitude, perl-tk, libproc-daemon-perl
Conflicts: fai
Replaces: fai
@@ -62,7 +62,7 @@
Package: fai-quickstart
Architecture: all
-Depends: fai-server, fai-doc, dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, reprepro, genisoimage, openbsd-inetd | inet-superserver
+Depends: fai-server, fai-doc, isc-dhcp-server | dhcp3-server, nfs-kernel-server, syslinux-common, tftpd-hpa, reprepro, 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
Modified: trunk/debian/fai-nfsroot.dirs
===================================================================
--- trunk/debian/fai-nfsroot.dirs 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/debian/fai-nfsroot.dirs 2010-07-30 14:27:56 UTC (rev 5916)
@@ -1,6 +1,6 @@
etc/fai
etc/init
-etc/dhcp3
etc/init.d
etc/apt/apt.conf.d
usr/lib/fai
+usr/share/fai
Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/debian/fai-nfsroot.install 2010-07-30 14:27:56 UTC (rev 5916)
@@ -6,8 +6,8 @@
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
+usr/share/fai/dhclient-fai-script
+usr/share/fai/dhclient-fai.conf
etc/apt/apt.conf.d/90fai
etc/init.d/fai-abort
etc/init/fai.conf
Modified: trunk/doc/fai-guide.txt
===================================================================
--- trunk/doc/fai-guide.txt 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/doc/fai-guide.txt 2010-07-30 14:27:56 UTC (rev 5916)
@@ -403,7 +403,7 @@
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 @@
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 @@
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
Modified: trunk/lib/get-boot-info
===================================================================
--- trunk/lib/get-boot-info 2010-07-30 04:25:25 UTC (rev 5915)
+++ trunk/lib/get-boot-info 2010-07-30 14:27:56 UTC (rev 5916)
@@ -62,7 +62,7 @@
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 /usr/share/fai/dhclient-fai.conf -sf /usr/share/fai/dhclient-fai-script $netdevices >>$bootlog 2> $LOGDIR/dhclient.log
killall dhclient
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
More information about the Fai-commit
mailing list