summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/cd_tester.sh12
-rwxr-xr-xetc/munin/plugins/jenkins_builds2
-rwxr-xr-xetc/munin/plugins/jenkins_builds_results2
-rw-r--r--userContent/debian-edu-wheezy-preseed.cfg13
4 files changed, 25 insertions, 4 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh
index af473d1e..f57189e6 100755
--- a/bin/cd_tester.sh
+++ b/bin/cd_tester.sh
@@ -116,6 +116,14 @@ monitor_installation() {
if [ $(($NR % 150)) -eq 0 ] ; then
vncdo -s localhost:$DISPLAY key ctrl
fi
+ # if this screenshot is the same as the one 400 screenshots ago, let stop this
+ if [ $(($NR % 100)) -eq 0 ] ; then
+ let OLD=nr-400
+ if test $(diff snapshot_$(printf "%06d" $NR).ppm snapshot_$(printf "%06d" $OLD).ppm 1>/dev/null) ; then
+ break
+ fi
+ fi
+
done
set -x
if [ $NR -eq 9000 ] ; then
@@ -130,7 +138,7 @@ trap cleanup_all INT TERM EXIT
#
if [ ! -z $IMAGE ] ; then
# only download if $IMAGE is older than a week (60*24*7=10080) (+9500 is a bit less than a week)
- if test $(find $IMAGE -mmin +9500) || ! test -f $IMAGE ; then
+ if test $(find $IMAGE ! -mmin +9500) || ! test -f $IMAGE ; then
curl $URL > $IMAGE
fi
sudo mkdir -p $IMAGE_MNT
@@ -140,7 +148,7 @@ else
# else netboot gtk
#
# only download if $KERNEL is older than a week...
- if test $(find $KERNEL -mmin +9500) || ! test -f $KERNEL ; then
+ if test $(find $KERNEL ! -mmin +9500) || ! test -f $KERNEL ; then
curl $URL/$KERNEL > $KERNEL
curl $URL/$INITRD > $INITRD
fi
diff --git a/etc/munin/plugins/jenkins_builds b/etc/munin/plugins/jenkins_builds
index 70f3c4ad..450cf4e0 100755
--- a/etc/munin/plugins/jenkins_builds
+++ b/etc/munin/plugins/jenkins_builds
@@ -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/etc/munin/plugins/jenkins_builds_results b/etc/munin/plugins/jenkins_builds_results
index e7661724..76b64bf0 100755
--- a/etc/munin/plugins/jenkins_builds_results
+++ b/etc/munin/plugins/jenkins_builds_results
@@ -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 c4151be4..4bbdce2d 100644
--- a/userContent/debian-edu-wheezy-preseed.cfg
+++ b/userContent/debian-edu-wheezy-preseed.cfg
@@ -376,3 +376,16 @@ d-i debian-installer/exit/poweroff boolean true
# packages and run commands in the target system.
#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
+#
+# edu specific settings
+#
+
+# Tell LTSP to not use the CDROM, but a HTTP mirror
+d-i ltsp-client-builder/use_cdrom boolean false
+d-i ltsp-client-builder/build-client-opts string --mirror http://ftp.skolelinux.org/debian --dist squeeze
+
+portmap portmap/loopback boolean false
+
+nslcd nslcd/ldap-base string dc=skole,dc=skolelinux,dc=no
+nslcd nslcd/ldap-uris string DNS
+