[Fai-commit] r5911 - in trunk: . bin debian lib
Thomas Lange
lange at alioth.debian.org
Fri Jul 30 03:23:58 UTC 2010
Author: lange
Date: 2010-07-30 03:23:58 +0000 (Fri, 30 Jul 2010)
New Revision: 5911
Removed:
trunk/bin/fai-start-stop-daemon
Modified:
trunk/Makefile
trunk/bin/make-fai-nfsroot
trunk/debian/changelog
trunk/debian/fai-server.install
trunk/lib/updatebase
Log:
* fai-start-stop-daemon: remove it, because not needed any more,
policy-rc.d is sufficient
* fai-server.install, updatebase, make-fai-nfsroot, Makefile: remove
fai-start-stop-daemon
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/Makefile 2010-07-30 03:23:58 UTC (rev 5911)
@@ -33,7 +33,6 @@
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/fai-start-stop-daemon $(DESTDIR)/sbin
install bin/dhclient-fai-script $(DESTDIR)/etc/dhcp3
install -m644 conf/dhclient-fai.conf $(DESTDIR)/etc/dhcp3
install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
Deleted: trunk/bin/fai-start-stop-daemon
===================================================================
--- trunk/bin/fai-start-stop-daemon 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/bin/fai-start-stop-daemon 2010-07-30 03:23:58 UTC (rev 5911)
@@ -1,50 +0,0 @@
-#! /bin/sh
-
-# $Id$
-#*********************************************************************
-#
-# start-stop-daemon -- a version which never starts daemons
-#
-# This script is part of FAI (Fully Automatic Installation)
-# (c) 2000-2006 by Thomas Lange, lange at informatik.uni-koeln.de
-# Universitaet zu Koeln
-#
-#*********************************************************************
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# A copy of the GNU General Public License is available as
-# `/usr/share/common-licences/GPL' in the Debian GNU/Linux distribution
-# or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html. You
-# can also obtain it by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#*********************************************************************
-
-while [ $# -gt 0 ]; do
- case $1 in
- -x|--exec) shift; prog="for $1" ;;
- -o|--oknodo) oknodo=1 ;;
- -S|--start) start=1 ;;
- -K|--stop) stop=1 ;;
- esac
- shift
-done
-
-case $prog in
- *udevd) /sbin/start-stop-daemon.distrib --start --quiet --exec /sbin/udevd -- --daemon
- ;;
- *) echo ""
- echo "Warning: Dummy start-stop-daemon called $prog. Doing nothing."
- ;;
-esac
-
-[ -n "$stop" -a -z "$oknodo" ] && exit 1
-
-exit 0
Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/bin/make-fai-nfsroot 2010-07-30 03:23:58 UTC (rev 5911)
@@ -397,9 +397,7 @@
fdivert /usr/sbin/update-initramfs
ln -sf /bin/true $NFSROOT/usr/sbin/update-initramfs
fi
- fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
- cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin
- cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
+ fdivert /sbin/discover-modprobe
$ROOTCMD apt-get -y dist-upgrade
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/debian/changelog 2010-07-30 03:23:58 UTC (rev 5911)
@@ -1,4 +1,4 @@
-fai (3.4~beta10) unstable; urgency=low
+fai (3.4~beta15) unstable; urgency=low
[ Thomas Lange ]
* get-config-dir-http: new script to get a tarball of the config space
@@ -90,6 +90,10 @@
* get-config-dir-svn: use exit code of first command of pipe
(closes: #557544)
* device2grub: fix indentation, minor code fix
+ * fai-start-stop-daemon: remove it, because not needed any more,
+ policy-rc.d is sufficient
+ * fai-server.install, updatebase, make-fai-nfsroot, Makefile: remove
+ fai-start-stop-daemon
[ Michael Tautschnig ]
* setup-storage: Bumped version number to 1.3
@@ -159,7 +163,7 @@
if the shortname has no match in device.map. Needed now that grub2 in
unstable has switched to using stable names in device.map.
- -- Thomas Lange <lange at debian.org> Wed, 28 Jul 2010 16:28:51 -0400
+ -- Thomas Lange <lange at debian.org> Thu, 29 Jul 2010 23:23:36 -0400
fai (3.3.5) unstable; urgency=high
Modified: trunk/debian/fai-server.install
===================================================================
--- trunk/debian/fai-server.install 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/debian/fai-server.install 2010-07-30 03:23:58 UTC (rev 5911)
@@ -1,4 +1,3 @@
-sbin/fai-start-stop-daemon
usr/bin/faimond-gui
usr/sbin/fai-cd
usr/sbin/fai-chboot
Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase 2010-07-29 23:50:20 UTC (rev 5910)
+++ trunk/lib/updatebase 2010-07-30 03:23:58 UTC (rev 5911)
@@ -14,8 +14,7 @@
# then init will eat up much cpu time
fai-divert -a /sbin/init /usr/sbin/liloconfig /usr/sbin/invoke-rc.d
# fake some more programs
- fai-divert -a /etc/init.d/nis /sbin/start-stop-daemon /usr/sbin/policy-rc.d
- cp /sbin/fai-start-stop-daemon $FAI_ROOT/sbin/start-stop-daemon
+ fai-divert -a /etc/init.d/nis /usr/sbin/policy-rc.d
# never start any daemons inside chroot during installtion
cat > $FAI_ROOT/usr/sbin/policy-rc.d <<EOF
#!/bin/sh
More information about the Fai-commit
mailing list