summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-02 18:31:12 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-02 18:31:12 +0100
commit1e221a2be5d85579166365828a1368d569d23d90 (patch)
tree80f46f8444527a468e292e3b3729b004e4042e88
parent171316b037b4000ff02cc2e5b75550cd2b826f5a (diff)
downloadjenkins.debian.net-1e221a2be5d85579166365828a1368d569d23d90.tar.xz
try harder to get edu + plugins working
-rwxr-xr-xetc/munin/plugins/jenkins_jobs2
-rw-r--r--userContent/debian-edu-wheezy-preseed.cfg4
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/munin/plugins/jenkins_jobs b/etc/munin/plugins/jenkins_jobs
index d9ddce10..3f3d6e82 100755
--- a/etc/munin/plugins/jenkins_jobs
+++ b/etc/munin/plugins/jenkins_jobs
@@ -32,7 +32,7 @@ fi
STATEFILE=$MUNIN_PLUGSTATE/$(basename $0)
# delete statefile if it's older than $update_interval set in /etc/munin/plugin-conf.d/jenkins
-if test $(find $STATEFILE -mmin +$update_interval) ; then
+if test $(find $STATEFILE ! -mmin +$update_interval) ; then
rm -f $STATEFILE
fi
diff --git a/userContent/debian-edu-wheezy-preseed.cfg b/userContent/debian-edu-wheezy-preseed.cfg
index 6fbacc6c..c4151be4 100644
--- a/userContent/debian-edu-wheezy-preseed.cfg
+++ b/userContent/debian-edu-wheezy-preseed.cfg
@@ -74,6 +74,10 @@ d-i netcfg/wireless_wep string
# component for remote installation over SSH. This only makes sense if you
# intend to perform the remainder of the installation manually.
#d-i anna/choose_modules string network-console
+
+# Enable the Debian Edu installer overrides
+d-i anna/choose_modules multiselect debian-edu-install-udeb: Execute Debian-Edu debian-installer profile
+
#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key
#d-i network-console/password password r00tme
#d-i network-console/password-again password r00tme