[debian-edu-commits] debian-edu/ 04/08: * Make it possible to enable debian-edu-etc-svk by preseeding debian-edu-config/etc-in-svk, and include cronjob for updating the svk state of /etc/. Depend on svk and expect to make sure the needed packages are installed.

[Alexander Alemayhu]

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

ccscanf-guest pushed a commit to annotated tag 0.412.0.edu.etch.1+svn35034
in repository debian-edu-config.

commit 1f1401ddfc8f5711549a43d0fa5cf8f5f42328e3
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Jun 25 21:40:44 2007 +0000

      * Make it possible to enable debian-edu-etc-svk by preseeding
        debian-edu-config/etc-in-svk, and include cronjob for updating
        the svk state of /etc/.  Depend on svk and expect to make
        sure the needed packages are installed.
---
 debian/changelog                   | 4 ++++
 debian/control                     | 2 +-
 debian/cron.d                      | 4 +++-
 debian/debian-edu-config.postinst  | 9 +++++++++
 debian/debian-edu-config.templates | 5 +++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97978ba..dda7cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ debian-edu-config (0.412.0.edu.etch.1+svn35015) terra; urgency=low
     skolelinux bug #1200.
   * Fixed debian-edu-etc-svk initialization using expect, and
     improved the script to a point where it is working properly.
+  * Make it possible to enable debian-edu-etc-svk by preseeding
+    debian-edu-config/etc-in-svk, and include cronjob for updating
+    the svk state of /etc/.  Depend on svk and expect to make
+    sure the needed packages are installed.
 
   [ Steffen Joeris ]
   * Include debian-edu-etc-svk under the SBIN programs in the Makefile
diff --git a/debian/control b/debian/control
index cc51b11..f145a3c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: po-debconf
 
 Package: debian-edu-config
 Architecture: all
-Depends: ${misc:Depends}, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, ssl-cert, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, lsof
+Depends: ${misc:Depends}, cfengine2, libconfig-inifiles-perl, mime-support, libnet-ldap-perl, ng-utils, host, desktop-profiles, lsb-base, ssl-cert, libfilesys-df-perl, libtext-unaccent-perl, libhtml-fromtext-perl, libio-socket-ssl-perl, lsof, svk, expect
 Replaces: ldap-skolelinux, cfengine-skolelinux, ncs
 Provides: cfengine-skolelinux, ncs
 Conflicts: ldap-skolelinux (<= 0.1-83), cfengine-skolelinux (<= 0.338), debian-edu-install (<= 0.616), samba (<<3.0.0), ncs
diff --git a/debian/cron.d b/debian/cron.d
index 0ad2b8f..b4fa9a5 100644
--- a/debian/cron.d
+++ b/debian/cron.d
@@ -1,5 +1,7 @@
 #
-# Only dry-run cron job until we know it is safe to run on an installed
+# Commit /etc/ in svk if activated
+0 * * * * [ -d ~root/.svk ] && /usr/sbin/debian-edu-etc-svk update
+# Only dry-run cfengine cron job until we know it is safe to run on an installed
 # system [pere 2003-08-30]
 # Disable until it no longer run in "installation" mode. [pere 2003-09-01]
 #9 4	* * *	root	if [ -x /usr/bin/cfengine-debian-edu ]; then /usr/bin/cfengine-debian-edu -n; fi
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index f7f6223..8e21639 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -67,6 +67,15 @@ if [ "$RET" = "false" ] ; then
 	fi
 fi
 db_go
+
+# Make it possible to activate debian-edu-etc-svk using preseeding
+db_get debian-edu-config/etc-in-svk
+if [ "$RET" = "true" ] ; then
+	if [ ! -d ~root/.svk ] ; then
+		debian-edu-etc-svk init
+	fi
+fi
+
 # Some init-scripts fail if to many fd is open ??
 # close debconf db_handle before they start
 db_stop
diff --git a/debian/debian-edu-config.templates b/debian/debian-edu-config.templates
index bd4139c..c360a46 100644
--- a/debian/debian-edu-config.templates
+++ b/debian/debian-edu-config.templates
@@ -9,3 +9,8 @@ Default: false
 _Description: Do you want to run enable-nat on your system?
  The enable-nat script activates NAT for your Thin-Clients and overwrites
  your iptables rules.
+
+Template: debian-edu-config/etc-in-svk
+Type: boolean
+Default: false
+Description: Do you want to run debian-edu-etc-svk on your system?

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