Attachment 1137 Details for Bug 8994 – optional use network-manager

[patch] optional use network-manager

network_manager.patch (text/plain), 21.58 KB, created by Andreas Büsching on 2008-05-08 22:55:34 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Büsching

Created: 2008-05-08 22:55:34 CEST

Size: 21.58 KB

patch

obsolete

>Index: debian/univention-mobile-client.dirs
>===================================================================
>--- debian/univention-mobile-client.dirs	(Revision 3132)
>+++ debian/univention-mobile-client.dirs	(Arbeitskopie)
>@@ -1,6 +1,7 @@
> etc/init.d
> usr/bin
>-etc/ifplugd/action.d/
>+etc/network/if-up.d/
>+etc/network/if-down.d/
> etc/bootsplash/themes/mobileclient
> etc/bootsplash/themes/mobileclient/images
> etc/bootsplash/themes/mobileclient/config
>Index: debian/control
>===================================================================
>--- debian/control	(Revision 3132)
>+++ debian/control	(Arbeitskopie)
>@@ -61,7 +61,7 @@
> Architecture: all
> Pre-Depends: univention-config-registry (>=0.06), univention-pam
> Conflicts: univention-application-server
>-Depends: openssh-server, univention-policy-tools, univention-updater, ldap-utils, ntp | ntp-server, univention-x-core, univention-join, libnss-passwdcache, libpam-passwdcache, menu, univention-directory-listener, univention-heimdal-member, univention-ldap-client, nscd, vim, bind9-host, strace, anacron, ifplugd, univention-mail-postfix-forward, nfs-common, univention-directory-policy, univention-printclient, univention-pkgdb-tools, univention-gdm-sessions, python-univention-directory-manager, univention-firewall, univention-lilo | univention-grub, univention-system-setup, hibernate, acpid, univention-archive-key
>+Depends: openssh-server, univention-policy-tools, univention-updater, ldap-utils, ntp | ntp-server, univention-x-core, univention-join, libnss-passwdcache, libpam-passwdcache, menu, univention-directory-listener, univention-heimdal-member, univention-ldap-client, nscd, vim, bind9-host, strace, anacron, ifplugd | network-manager, univention-mail-postfix-forward, nfs-common, univention-directory-policy, univention-printclient, univention-pkgdb-tools, univention-gdm-sessions, python-univention-directory-manager, univention-firewall, univention-lilo | univention-grub, univention-system-setup, hibernate, acpid, univention-archive-key
> Description: UCS - Mobile Client
>  This is a Meta-package, that sets up a UCS mobile client
>  .
>@@ -76,7 +76,7 @@
> Conflicts: univention-application-server, univention-fat-client, univention-fat-client-small
> Replaces: univention-fat-client, univention-fat-client-small
> Provides: univention-fat-client, univention-fat-client-small
>-Depends: openssh-server, univention-policy-tools, univention-updater, ldap-utils, ntp | ntp-server, univention-x-core, univention-join, libnss-passwdcache, libpam-passwdcache, menu, univention-directory-listener, univention-heimdal-member, univention-ldap-client, nscd, vim, bind9-host, strace, anacron, ifplugd, univention-mail-postfix-forward, nfs-common, univention-directory-policy, univention-printclient, univention-pkgdb-tools, univention-gdm-sessions, python2.4-univention-admin | python2.4-univention-admin-2005, univention-firewall, univention-lilo | univention-grub, univention-system-setup, acpid, univention-archive-key
>+Depends: openssh-server, univention-policy-tools, univention-updater, ldap-utils, ntp | ntp-server, univention-x-core, univention-join, libnss-passwdcache, libpam-passwdcache, menu, univention-directory-listener, univention-heimdal-member, univention-ldap-client, nscd, vim, bind9-host, strace, anacron, ifplugd | network-manager, univention-mail-postfix-forward, nfs-common, univention-directory-policy, univention-printclient, univention-pkgdb-tools, univention-gdm-sessions, python2.4-univention-admin | python2.4-univention-admin-2005, univention-firewall, univention-lilo | univention-grub, univention-system-setup, acpid, univention-archive-key
> Description: UCS - Managed Client
>  This is a Meta-package, that sets up a UCS fat client
>  .
>@@ -96,4 +96,3 @@
>  an integrated, directory driven solution for managing
>  corporate environments. For more information about UCS,
>  refer to: http://www.univention.de/
>-
>Index: debian/univention-managed-client.links
>===================================================================
>--- debian/univention-managed-client.links	(Revision 0)
>+++ debian/univention-managed-client.links	(Revision 0)
>@@ -0,0 +1,2 @@
>+usr/share/univention-managed-client/check_connection etc/network/if-up.d/05-auth-methods.sh
>+usr/share/univention-managed-client/check_connection etc/network/if-down.d/05-auth-methods.sh
>\ Kein Zeilenvorschub am Ende der Datei
>Index: debian/changelog
>===================================================================
>--- debian/changelog	(Revision 3132)
>+++ debian/changelog	(Arbeitskopie)
>@@ -1,3 +1,10 @@
>+univention-server (2.2.13-1) unstable; urgency=low
>+
>+  * use scripts in /etc/network/if-(up|down).d/ instead if ifplugd specific
>+    directories; so the scripts also work with network manager
>+
>+ -- Andreas Bï¿½sching <buesching@univention.de>  Thu,  8 May 2008 19:53:08 +0200
>+
> univention-server (2.2.12-1) unstable; urgency=low
> 
>   * redirect the normal output to /dev/null in check_connection
>Index: debian/rules
>===================================================================
>--- debian/rules	(Revision 3132)
>+++ debian/rules	(Arbeitskopie)
>@@ -78,25 +78,18 @@
> 
> 	install -m 755 managed-client debian/univention-managed-client/etc/init.d/
> 	install -m 755 univention-domain-connection debian/univention-managed-client/usr/bin/
>-	install -m 755 etc/ifplugd/action.d/nscd debian/univention-managed-client/etc/ifplugd/action.d/nscd
>-	install -m 755 etc/ifplugd/action.d/gdm debian/univention-managed-client/etc/ifplugd/action.d/gdm
>-	install -m 755 etc/ifplugd/action.d/mount debian/univention-managed-client/etc/ifplugd/action.d/mount
>+
>+	install -m 755 etc/network/if-up.d/*.sh debian/univention-managed-client/etc/network/if-up.d
>+	install -m 755 etc/network/if-down.d/*.sh debian/univention-managed-client/etc/network/if-down.d
> 	install -m 755 univention-directory-policy/univention-set-ldap-server debian/univention-managed-client/usr/lib/univention-directory-policy/
> 	install -m 755 check_connection debian/univention-managed-client/usr/share/univention-managed-client/
> 
> 	install -m 755 mobile-client debian/univention-mobile-client/etc/init.d/
> 	install -m 755 check_connection debian/univention-mobile-client/usr/share/univention-mobile-client/
>-	install -m 755 etc/ifplugd/action.d/nscd debian/univention-mobile-client/etc/ifplugd/action.d/nscd
>-	install -m 755 etc/ifplugd/action.d/gdm debian/univention-mobile-client/etc/ifplugd/action.d/gdm
>-	install -m 755 etc/ifplugd/action.d/mount debian/univention-mobile-client/etc/ifplugd/action.d/mount
>+	install -m 755 etc/network/if-up.d/*.sh debian/univention-mobile-client/etc/network/if-up.d
>+	install -m 755 etc/network/if-down.d/*.sh debian/univention-mobile-client/etc/network/if-down.d
> 	install -m 755 univention-directory-policy/univention-set-ldap-server debian/univention-mobile-client/usr/lib/univention-directory-policy/
> 
>-	# add ntpd information used by univention-console
>-	echo "Timeserver;ntp-server;/usr/sbin/ntpd;23" > debian/univention-server-master/etc/univention/daemons/ntpd
>-	echo "Timeserver;ntp-server;/usr/sbin/ntpd;23" > debian/univention-server-backup/etc/univention/daemons/ntpd
>-	echo "Timeserver;ntp-server;/usr/sbin/ntpd;23" > debian/univention-server-slave/etc/univention/daemons/ntpd
>-	echo "Timeserver;ntp-server;/usr/sbin/ntpd;23" > debian/univention-server-member/etc/univention/daemons/ntpd
>-
> 	univention-install-baseconfig
> 
> binary-arch: build install
>Index: debian/univention-mobile-client.links
>===================================================================
>--- debian/univention-mobile-client.links	(Revision 0)
>+++ debian/univention-mobile-client.links	(Revision 0)
>@@ -0,0 +1,2 @@
>+usr/share/univention-mobile-client/check_connection etc/network/if-up.d/05-auth-methods.sh
>+usr/share/univention-mobile-client/check_connection etc/network/if-down.d/05-auth-methods.sh
>\ Kein Zeilenvorschub am Ende der Datei
>Index: debian/univention-managed-client.dirs
>===================================================================
>--- debian/univention-managed-client.dirs	(Revision 3132)
>+++ debian/univention-managed-client.dirs	(Arbeitskopie)
>@@ -1,7 +1,8 @@
> etc/init.d
> etc/cron.d
> usr/bin
>-etc/ifplugd/action.d/
>+etc/network/if-up.d/
>+etc/network/if-down.d/
> etc/bootsplash/themes/managedclient/images
> etc/bootsplash/themes/managedclient/config
> usr/share/apps/kdesktop/DesktopLinks
>Index: etc/network/if-up.d/50-gdm.sh
>===================================================================
>--- etc/network/if-up.d/50-gdm.sh	(Revision 0)
>+++ etc/network/if-up.d/50-gdm.sh	(Revision 0)
>@@ -0,0 +1,36 @@
>+#!/bin/sh
>+#
>+# Univention Server
>+#  network script: reloads GDM configuration when network state
>+#  changes
>+#
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License version 2 as
>+# published by the Free Software Foundation.
>+#
>+# Binary versions of this file provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention.
>+#
>+# 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.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+
>+set -e
>+
>+if [ -x /etc/init.d/gdm ]; then
>+	/etc/init.d/gdm reload
>+fi
>
>EigenschaftsÃ¤nderungen: etc/network/if-up.d/50-gdm.sh
>___________________________________________________________________
>Name: svn:executable
>   + *
>
>Index: etc/network/if-up.d/15-nscd.sh
>===================================================================
>--- etc/network/if-up.d/15-nscd.sh	(Revision 0)
>+++ etc/network/if-up.d/15-nscd.sh	(Revision 0)
>@@ -0,0 +1,37 @@
>+#!/bin/sh
>+#
>+# Univention Server
>+#  network script: set authentication methods
>+#
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License version 2 as
>+# published by the Free Software Foundation.
>+#
>+# Binary versions of this file provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention.
>+#
>+# 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.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+
>+set -e
>+
>+if [ -x /etc/init.d/nscd ]; then
>+	/etc/init.d/nscd restart
>+	nscd -i passwd
>+	nscd -i group
>+fi
>
>EigenschaftsÃ¤nderungen: etc/network/if-up.d/15-nscd.sh
>___________________________________________________________________
>Name: svn:executable
>   + *
>
>Index: etc/network/if-up.d/20-mount.sh
>===================================================================
>--- etc/network/if-up.d/20-mount.sh	(Revision 0)
>+++ etc/network/if-up.d/20-mount.sh	(Revision 0)
>@@ -0,0 +1,37 @@
>+#!/bin/sh
>+#
>+# Univention Server
>+#  network script: (re)mounts all entries from /etc/fstab when
>+#  the network link is active
>+#
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License version 2 as
>+# published by the Free Software Foundation.
>+#
>+# Binary versions of this file provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention.
>+#
>+# 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.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+
>+set -e
>+
>+eval `univention-baseconfig shell ifplugd/action/mount`
>+[ "$ifplugd_action_mount" = "yes" -o "$ifplugd_action_mount" = "true" ] ||  exit 0
>+
>+[ -x /bin/mount ] && /bin/mount -a
>
>EigenschaftsÃ¤nderungen: etc/network/if-up.d/20-mount.sh
>___________________________________________________________________
>Name: svn:executable
>   + *
>
>Index: etc/network/if-down.d/50-gdm.sh
>===================================================================
>--- etc/network/if-down.d/50-gdm.sh	(Revision 0)
>+++ etc/network/if-down.d/50-gdm.sh	(Revision 0)
>@@ -0,0 +1,36 @@
>+#!/bin/sh
>+#
>+# Univention Server
>+#  network script: reloads GDM configuration when network state
>+#  changes
>+#
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License version 2 as
>+# published by the Free Software Foundation.
>+#
>+# Binary versions of this file provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention.
>+#
>+# 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.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+
>+set -e
>+
>+if [ -x /etc/init.d/gdm ]; then
>+	/etc/init.d/gdm reload
>+fi
>
>EigenschaftsÃ¤nderungen: etc/network/if-down.d/50-gdm.sh
>___________________________________________________________________
>Name: svn:executable
>   + *
>
>Index: etc/network/if-down.d/15-nscd.sh
>===================================================================
>--- etc/network/if-down.d/15-nscd.sh	(Revision 0)
>+++ etc/network/if-down.d/15-nscd.sh	(Revision 0)
>@@ -0,0 +1,37 @@
>+#!/bin/sh
>+#
>+# Univention Server
>+#  network script: restarts nscd when network state changes
>+#
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# This program is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU General Public License version 2 as
>+# published by the Free Software Foundation.
>+#
>+# Binary versions of this file provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention.
>+#
>+# 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.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with this program; if not, write to the Free Software
>+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>+
>+set -e
>+
>+if [ -x /etc/init.d/nscd ]; then
>+	/etc/init.d/nscd restart
>+	nscd -i passwd
>+	nscd -i group
>+fi
>
>EigenschaftsÃ¤nderungen: etc/network/if-down.d/15-nscd.sh
>___________________________________________________________________
>Name: svn:executable
>   + *
>
>Index: etc/ifplugd/action.d/mount
>===================================================================
>--- etc/ifplugd/action.d/mount	(Revision 3132)
>+++ etc/ifplugd/action.d/mount	(Arbeitskopie)
>@@ -1,45 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Server
>-#  ifplugd action script: (re)mounts all entries from /etc/fstab when
>-#  the network link is active
>-#
>-# Copyright (C) 2004, 2005, 2006 Univention GmbH
>-#
>-# http://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License version 2 as
>-# published by the Free Software Foundation.
>-#
>-# Binary versions of this file provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention.
>-#
>-# 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.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>-
>-set -e
>-
>-eval `univention-baseconfig shell ifplugd/action/mount`
>-[ "$ifplugd_action_mount" = "yes" -o "$ifplugd_action_mount" = "true" ] ||  exit 0
>-
>-case "$2" in
>-up)
>-	if [ -x /bin/mount ]; then
>-		/bin/mount -a
>-	fi
>-	;;
>-down)
>-	;;
>-esac
>Index: etc/ifplugd/action.d/gdm
>===================================================================
>--- etc/ifplugd/action.d/gdm	(Revision 3132)
>+++ etc/ifplugd/action.d/gdm	(Arbeitskopie)
>@@ -1,45 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Server
>-#  ifplugd action script: reloads GDM configuration when network state
>-#  changes
>-#
>-# Copyright (C) 2004, 2005, 2006 Univention GmbH
>-#
>-# http://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License version 2 as
>-# published by the Free Software Foundation.
>-#
>-# Binary versions of this file provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention.
>-#
>-# 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.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>-
>-set -e
>-
>-case "$2" in
>-up)
>-	if [ -x /etc/init.d/gdm ]; then
>-		/etc/init.d/gdm reload
>-	fi
>-	;;
>-down)
>-	if [ -x /etc/init.d/gdm ]; then
>-		/etc/init.d/gdm reload
>-	fi
>-	;;
>-esac
>Index: etc/ifplugd/action.d/nscd
>===================================================================
>--- etc/ifplugd/action.d/nscd	(Revision 3132)
>+++ etc/ifplugd/action.d/nscd	(Arbeitskopie)
>@@ -1,44 +0,0 @@
>-#!/bin/sh
>-#
>-# Univention Server
>-#  ifplugd action script: restarts nscd when network state changes
>-#
>-# Copyright (C) 2004, 2005, 2006 Univention GmbH
>-#
>-# http://www.univention.de/
>-#
>-# All rights reserved.
>-#
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License version 2 as
>-# published by the Free Software Foundation.
>-#
>-# Binary versions of this file provided by Univention to you as
>-# well as other copyrighted, protected or trademarked materials like
>-# Logos, graphics, fonts, specific documentations and configurations,
>-# cryptographic keys etc. are subject to a license agreement between
>-# you and Univention.
>-#
>-# 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.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>-
>-set -e
>-
>-case "$2" in
>-up)
>-	if [ -x /etc/init.d/nscd ]; then
>-		/etc/init.d/nscd restart
>-	fi
>-	;;
>-down)
>-	if [ -x /etc/init.d/nscd ]; then
>-		/etc/init.d/nscd restart
>-	fi
>-	;;
>-esac
>Index: check_connection
>===================================================================
>--- check_connection	(Revision 3132)
>+++ check_connection	(Arbeitskopie)
>@@ -5,7 +5,7 @@
> #  connection fails 'ldap' is removed from the list of possible
> #  authentication methods
> #
>-# Copyright (C) 2004, 2005, 2006 Univention GmbH
>+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Univention GmbH
> #
> # http://www.univention.de/
> #
>@@ -43,7 +43,7 @@
> 
> 
> action () {
>-	/etc/ifplugd/ifplugd.action all $1 >/dev/null
>+	run-parts /etc/network/if-${1}.d/ >/dev/null
> }
> 
> connection_okay=0

Actions: View | Diff

Attachments on bug 8994: 1137