Changeset 1213

Timestamp:

01/14/12 22:17:26 (4 months ago)

Author:

tschmitt

Message:

• dhcp-Server Konfiguration angepasst.
• obsolete Configs entfernt.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• var/config-dynamic/00_stop-services/prepatch (modified) (2 diffs)
• var/config-dynamic/03_dhcp3-server/dhcpd.conf (added)
• var/config-dynamic/03_dhcp3-server/dhcpd.conf.linbo (deleted)
• var/config-dynamic/03_dhcp3-server/dhcpd.conf.rembo (deleted)
• var/config-dynamic/03_dhcp3-server/postpatch (modified) (1 diff, 1 prop)
• var/config-dynamic/03_dhcp3-server/prepatch (deleted)
• var/config-static/etc/default/rembo (deleted)
• var/config-static/etc/default/uml-utilities (deleted)
• var/config-static/etc/dhcp (added)
• var/config-static/etc/dhcp/dhcpd.conf.linuxmuster (added)
• var/config-static/etc/dhcp3 (deleted)

main/linuxmuster-base/branches/testing/debian/changelog

@@ -5 +5 @@
   * deactivated various ipcop stuff.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 21:27:57 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 14 Jan 2012 21:27:37 +0100
 
 linuxmuster-base (5.1.0-3lenny0) lenny; urgency=low

main/linuxmuster-base/branches/testing/var/config-dynamic/00_stop-services/prepatch

@@ -6 +6 @@
           linbo-multicast nagios3 atd cron rembo quota apache2 cups \
           clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \
-          mysql openntpd ssh samba slapd postgresql-8.4 nscd portmap \
-          openbsd-inetd bind9 dhcp3-server"
+          mysql openntpd ssh samba slapd postgresql-9.1 nscd portmap \
+          openbsd-inetd bind9 isc-dhcp-server"
 
 # make sure they are enabled to be able to shut them down
@@ -14 +14 @@
 
 for service in $services; do
-
-        [ -e "/etc/init.d/$service" ] && /etc/init.d/$service stop
-
+ [ -e "/etc/init.d/$service" ] && /etc/init.d/$service stop
 done
 

main/linuxmuster-base/branches/testing/var/config-dynamic/03_dhcp3-server/postpatch

@@ -1 @@
-# delete temporary tepmplate
-[ -e dhcpd.conf ] && rm dhcpd.conf
+# $Id$
 
 # patch internal interface
-[ "$1" = "--modfify" ] && backup_file /etc/default/dhcp3-server
-sed -e "s/^INTERFACES=.*/INTERFACES=\"$intern\"/" -i /etc/default/dhcp3-server
+[ "$1" = "--modfify" ] && backup_file /etc/isc-dhcp-server
+sed -e "s/^INTERFACES=.*/INTERFACES=\"$intern\"/" -i /etc/isc-dhcp-server
 
 # simply start the service
-/etc/init.d/dhcp3-server start
+/etc/init.d/isc-dhcp-server start