Changeset 1227

Timestamp:

01/17/12 08:58:52 (4 months ago)

Author:

tschmitt

Message:

• linuxmuster-setup:
  • /etc/network/interfaces: DNS-Einträge entfernt.
  • start-/stop-Fixes für Dienste.
  • Verschiebe /var/run and /var/lock nach /run.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (2 diffs)
• var/config-dynamic/00_stop-services/prepatch (modified) (2 diffs)
• var/config-dynamic/01_network/interfaces.dedicated (modified) (1 diff)
• var/config-dynamic/99_start-services/postpatch (modified) (1 diff)

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

@@ +1 @@
+linuxmuster-base (6.0.0-3ubuntu0) lenny; urgency=low
+
+  * linuxmuster-setup:
+    * service stop and start fixes.
+    * fix: move /var/run and /var/lock to /run and substitute old dirs with links to new dirs.
+    * /etc/network/interfaces: removed dns entries for intern interface.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Tue, 17 Jan 2012 08:53:42 +0100
+
 linuxmuster-base (6.0.0-2ubuntu0) lenny; urgency=low
 
@@ -6 +15 @@
     * fixed postgresql init skript name.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 22:08:23 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Jan 2012 22:10:42 +0100
 
 linuxmuster-base (6.0.0-1ubuntu0) lenny; urgency=low

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

@@ -9 +9 @@
           clamav-freshclam clamav-daemon cyrus2.2 postfix saslauthd amavis \
           mysql openntpd ssh samba slapd postgresql nscd portmap \
-          openbsd-inetd bind9 isc-dhcp-server"
+          openbsd-inetd bind9 isc-dhcp-server dbus"
 
 # make sure they are enabled to be able to shut them down
@@ -17 +17 @@
 for service in $services; do
  [ -e "/etc/init.d/$service" ] && /etc/init.d/$service stop
+ [ -e "/etc/init/$service.conf" ] && stop $service
 done
 
+# fix run directory
+if [ ! -d /run/lock ]; then
+ echo "fix run directory"
+ ls -l /var/run >> $logfile
+ ls -l /var/lock >> $logfile
+ mkdir -p /run/lock
+ rm -rf /var/run
+ rm -rf /var/lock
+ ln -s /run /var/run
+ ln -s /run/lock /var/lock
+fi
+

main/linuxmuster-base/branches/testing/var/config-dynamic/01_network/interfaces.dedicated

@@ -15 +15 @@
         broadcast @@broadcast@@
         gateway @@ipcopip@@
-        # dns-* options are implemented by the resolvconf package, if installed
-        dns-nameservers @@serverip@@
-        dns-search @@domainname@@
+

main/linuxmuster-base/branches/testing/var/config-dynamic/99_start-services/postpatch

@@ -61 +61 @@
 
 # start services not yet started
-services="openbsd-inetd atd cron openntpd linuxmuster-base"
+services="dbus openbsd-inetd atd cron openntpd linuxmuster-base"
 for service in $services; do
- [ -e "$service" ] && /etc/init.d/$service start
+ [ -e "/etc/init.d/$service" ] && /etc/init.d/$service start
+ [ -e "/etc/init/$service.conf" ] && start $service
 done