diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/itzks-systems-common.postinst | 15 | ||||
| -rwxr-xr-x | sbin/itzks-systems-common.do_preseed | 38 |
3 files changed, 40 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index b562b70..1465116 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ itzks-systems (2013.03.25.4) UNRELEASED; urgency=low + Fix broken symlinks to memtest86.bin and memtest86+.bin. * /debian/templates: + Add dummy schools: DEMO, TEST. + * /debian/itzks-systems-common.postinst: + + Move the preseeding of OCS inventory agent into non-packaging script. * PXE boot configuration: + Remove LTSP string from boot menu as it is over-informative to the normal user. diff --git a/debian/itzks-systems-common.postinst b/debian/itzks-systems-common.postinst index 29a7dc7..79104ca 100755 --- a/debian/itzks-systems-common.postinst +++ b/debian/itzks-systems-common.postinst @@ -20,16 +20,6 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -do_preseed() { - pkg="$1" - template="$2" - type="$3" - value="$4" - echo "Preseeding $template to $value" - echo $pkg $template $type "$value" | debconf-set-selections || \ - echo "Failed to load preseed '$template'" 1>&2 -} - case "$1" in configure) # query the school name and preseed ocsinventory-agent @@ -39,11 +29,6 @@ case "$1" in # write the school name to an /etc/ file echo $RET 1> /etc/debian-edu/itzks.school - # and finally preseed ocsinventory-agent - do_preseed ocsinventory-agent ocsinventory-agent/tag string $RET - do_preseed ocsinventory-agent ocsinventory-agent/method select http - do_preseed ocsinventory-agent ocsinventory-agent/server string inventory.it-zukunft-schule.de - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/sbin/itzks-systems-common.do_preseed b/sbin/itzks-systems-common.do_preseed new file mode 100755 index 0000000..2c78a19 --- /dev/null +++ b/sbin/itzks-systems-common.do_preseed @@ -0,0 +1,38 @@ +#!/bin/sh + +# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de> + +# This script is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This script 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 + +do_preseed() { + pkg="$1" + template="$2" + type="$3" + value="$4" + echo "Preseeding $template to $value" + echo $pkg $template $type "$value" | debconf-set-selections || \ + echo "Failed to load preseed '$template'" 1>&2 +} + +CUSTOMER=$(cat /etc/debian-edu/itzks.school) + +# and finally preseed ocsinventory-agent +do_preseed ocsinventory-agent ocsinventory-agent/tag string $CUSTOMER +do_preseed ocsinventory-agent ocsinventory-agent/method select http +do_preseed ocsinventory-agent ocsinventory-agent/server string inventory.it-zukunft-schule.de + |