[debian-edu-commits] debian-edu/ 01/02: Revert "Prevent autofs from starting on tjener. (Closes: #876376)"

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu.

commit 48fcd08f9e80d4e30223dcbe373cc6b6b3b2da96
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 2 00:00:42 2017 +0200

    Revert "Prevent autofs from starting on tjener. (Closes: #876376)"
    
    As discussed in #876376 I'm reverting this, at least for now. I'll keep the
    bug open, so we can keep discussing this. (Though eventually we should close
    it, one way or another.)
    
    This reverts commit 42b28ab02614aacbcbe7fde3b20ca3c57f85b24b.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                          | 4 ----
 debian/control                            | 1 -
 debian/control.stub                       | 1 -
 debian/education-networked-common.install | 1 -
 systemd/autofs.service.d/debian-edu.conf  | 3 ---
 5 files changed, 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ee79cf..f0e40a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 debian-edu (1.928) UNRELEASED; urgency=medium
 
-  [ Dominik George ]
-  * Prevent autofs from starting on tjener. (Closes: #876376)
-  * Add myself to Uploaders.
-
   [ Holger Levsen ]
   * debian/control:
     - Bump Standards-Version to 4.1.1, no changes needed.
diff --git a/debian/control b/debian/control
index 51ef9ee..68ab471 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Holger Levsen <holger at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
- Dominik George <nik at naturalnet.de>
 Build-Depends: debhelper (>= 10.2.5~), blends-dev (>= 0.6.100)
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/debian-edu/debian-edu.git
diff --git a/debian/control.stub b/debian/control.stub
index f1a6f02..056f130 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -6,7 +6,6 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Holger Levsen <holger at debian.org>,
  Mike Gabriel <sunweaver at debian.org>,
  Wolfgang Schweer <wschweer at arcor.de>,
- Dominik George <nik at naturalnet.de>
 Build-Depends: debhelper (>= 10.2.5~), blends-dev (>= 0.6.100)
 Standards-Version: 4.1.1
 Vcs-Git: https://anonscm.debian.org/git/debian-edu/debian-edu.git
diff --git a/debian/education-networked-common.install b/debian/education-networked-common.install
deleted file mode 100644
index 5af356d..0000000
--- a/debian/education-networked-common.install
+++ /dev/null
@@ -1 +0,0 @@
-systemd/autofs.service.d/debian-edu.conf lib/systemd/system/autofs.service.d
diff --git a/systemd/autofs.service.d/debian-edu.conf b/systemd/autofs.service.d/debian-edu.conf
deleted file mode 100644
index eb9f555..0000000
--- a/systemd/autofs.service.d/debian-edu.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-ConditionHost=!tjener
-ConditionHost=!tjener.intern

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git