stable update proposal: debian-edu-config
Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
here is a update proposal for the stable release.
I propose to update the version of debian-edu-config in the stable
repository from 1.416+svn39481 to 1.416+svn39964.
The update fixes a few annoying bugs affecting the script to enable
diskless workstations, as well as updates the cfengine rule to correct
the iceweasel configuration. Some redundant changes, but I decided to
leave them as they are to avoid further uploads now that this package
is tested and found to work.
Here is the debdiff:
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/changelog /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/changelog
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/changelog 2007-12-01 14:06:52.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/changelog 2008-01-23 13:45:10.000000000 +0100
@@ -1,3 +1,31 @@
+debian-edu-config (1.416+svn39964) terra; urgency=low
+
+ [ Petter Reinholdtsen ]
+ * Comment out call from apt to debian-edu-etc-svk, as it messes
+ with the terminal and make some install scenarios hang.
+ * Set SVKBATCHMODE in debian-edu-etc-svk to enable interactive
+ mode when used with svk version 2.0.1-1 and above.
+ * Fix exim config fix for bug #1264 to not fail in LTSP chroots, where
+ exim isn't installed.
+
+ [ Patrick Winnertz ]
+ * Rename cf.mozilla to cf.iceweasel and made it modify the correct files
+ (Closes Skolelinux bug: 1298).
+ * Made iceweasel use icedove instead of mozilla-thunderbird.
+
+ -- Petter Reinholdtsen <pere@debian.org> Wed, 23 Jan 2008 13:44:07 +0100
+
+debian-edu-config (1.416+svn39828) terra; urgency=low
+
+ * Make sure our extra LTSP packages and preseeding is used also when LTSP chroot is
+ generated after installation.
+ * Change APT hook for the debian-edu-etc-svk call do not block waiting for
+ input by redirecting stdin from /dev/null.
+ * Ignore failures from debian-edu-etc-svk in the postinst while we wait for
+ svk bug #435786 to be fixed.
+
+ -- Petter Reinholdtsen <pere@debian.org> Fri, 14 Dec 2007 23:44:20 +0100
+
debian-edu-config (1.416+svn39481) terra; urgency=low
[ Ronny Aasen ]
@@ -10,10 +38,9 @@
* Add ltsp-build-client script fragment to pull in alsa-utils when
building the thin client chroot. Solves Skolelinux bug #1288,
at least for new installs.
- * Make sure init.d/update-hostname is _not_ restarted on upgrades.
+ * Make sure init.d/update-hostname only run on boot.
(Solves skolelinux bug #1287).
- * Make sure init.d/boot_xconf is not restarted on upgrades and installation
- either. It should only start on boot.
+ * Make sure init.d/boot_xconf only run on boot.
* Quiet down nbdswap-cleanup when nc fail to connect to the client.
* Undo some description changes in root.ldif, and sync the names with
samba-debian-edu-admin, using 'institution' instead of 'school' to
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/debian-edu-config.postinst /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/debian-edu-config.postinst
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/debian-edu-config.postinst 2007-11-24 11:37:46.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/debian-edu-config.postinst 2008-01-23 13:42:26.000000000 +0100
@@ -12,7 +12,7 @@
if [ "$RET" = "true" ] ; then
if [ ! -d ~root/.svk ] ; then
ETCSVK=true
- debian-edu-etc-svk init > /dev/null
+ debian-edu-etc-svk init > /dev/null || true
else
debian-edu-etc-svk ignore mtab > /dev/null || true
fi
@@ -122,7 +122,7 @@
#DEBHELPER#
#fix symlink for exim4.conf, related to #1264
-if [ -h /etc/exim4/exim4.conf ] ; then
+if [ -h /etc/exim4/exim4.conf ] && [ -x /etc/init.d/exim4 ] ; then
if [ $(readlink /etc/exim4/exim4.conf) = "/etc/exim/exim-ldap-client-v4.conf" ] ; then
ln -sf /etc/exim4/exim-ldap-client-v4.conf /etc/exim4/exim4.conf
invoke-rc.d exim4 reload
@@ -130,6 +130,8 @@
fi
# Register all changes done by this postinst script
-[ true = "$ETCSVK" ] && debian-edu-etc-svk commit
+if [ true = "$ETCSVK" ] ; then
+ debian-edu-etc-svk commit || true
+fi
exit 0
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/debian-edu-config.update-hostname /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/debian-edu-config.update-hostname
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/debian/debian-edu-config.update-hostname 2006-09-25 14:25:53.000000000 +0200
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/debian/debian-edu-config.update-hostname 2008-01-03 11:56:28.000000000 +0100
@@ -9,6 +9,10 @@
# Short-Description: Set hostname based on current IP address
# Description:
### END INIT INFO
+#
+# This script is almost the same as the hostname.dhcp script in
+# nfsbooted. Perhaps the two should be combined into a separate
+# package?
UPDATE=/usr/bin/update-hostname-from-ip
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/etcsvk-apt.conf /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/etcsvk-apt.conf
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/etcsvk-apt.conf 2007-11-23 21:57:17.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/etcsvk-apt.conf 2007-12-24 10:11:11.000000000 +0100
@@ -1,2 +1,4 @@
-DPkg::Pre-Install-Pkgs { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit || true; fi"; };
-DPkg::Post-Invoke { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit || true; fi"; };
+// debian-edu-etc-svk commit messes up the terminal and hangs waiting for input
+// from stdin. Disabled to avoid it.
+//DPkg::Pre-Install-Pkgs { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit < /dev/null || true; fi"; };
+//DPkg::Post-Invoke { "if [ -x /usr/sbin/debian-edu-etc-svk ]; then debian-edu-etc-svk commit < /dev/null || true; fi"; };
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/ldap-tools/samba-debian-edu-admin /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/ldap-tools/samba-debian-edu-admin
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/ldap-tools/samba-debian-edu-admin 2007-11-29 23:01:55.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/ldap-tools/samba-debian-edu-admin 2007-12-02 21:56:43.000000000 +0100
@@ -21,8 +21,8 @@
exit 1
fi
-# XXX Starting and restarting services do not work during installation.
-# XXX start-stop-daemon is a dummy replacement and take care of that.
+# XXX Starting and restarting services does not work during installation.
+# XXX There, start-stop-daemon is a dummy replacement and takes care of that.
# Start slapd
/etc/init.d/slapd start
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/sbin/debian-edu-etc-svk /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/sbin/debian-edu-etc-svk
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/sbin/debian-edu-etc-svk 2007-11-23 22:09:49.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/sbin/debian-edu-etc-svk 2008-01-09 10:23:03.000000000 +0100
@@ -146,6 +146,11 @@
fi
export HOME
+# Make sure svk is non-interactive. Supported in svk version
+# 2.0.1-1 and above.
+SVKBATCHMODE=true
+export SVKBATCHMODE
+
case "$1" in
prepare)
do_prepare
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs 2007-12-04 12:01:44.000000000 +0100
@@ -0,0 +1,11 @@
+case "$MODE" in
+ configure)
+ LATE_PACKAGES="$LATE_PACKAGES \
+ sitesummary-client \
+ debian-edu-artwork \
+ debian-edu-artwork-usplash \
+ debian-edu-archive-keyring \
+ ltspfsd"
+ DEBCONF_SEEDS="$DEBCONF_SEEDS /usr/lib/debian-edu-install/defaults.ltsp-chroot"
+ ;;
+esac
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/Makefile /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/Makefile
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/Makefile 2007-11-27 16:08:44.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/Makefile 2008-01-23 13:41:30.000000000 +0100
@@ -45,7 +45,7 @@
cf.locale \
cf.ltsp \
cf.fstab \
- cf.mozilla \
+ cf.iceweasel \
cf.munin \
cf.nagios \
cf.nagios2 \
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cfengine.conf /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cfengine.conf
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cfengine.conf 2007-11-04 20:16:54.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cfengine.conf 2008-01-23 13:41:30.000000000 +0100
@@ -98,7 +98,7 @@
cf.squid
cf.ssh
cf.syslog
- cf.mozilla
+ cf.iceweasel
cf.ldapclient
cf.fstab
cf.munin
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cf.iceweasel /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cf.iceweasel
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cf.iceweasel 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cf.iceweasel 2008-01-23 13:41:30.000000000 +0100
@@ -0,0 +1,49 @@
+#
+# Configure Proxy and Printer settings
+# in iceweasel
+#
+
+editfiles:
+
+ debian.installation.workstation::
+
+ { /etc/iceweasel/pref/iceweasel.js
+
+ BeginGroupIfNoSuchLine "// Proxy Settings"
+ AppendIfNoSuchLine '// Proxy Settings'
+ AppendIfNoSuchLine 'pref("network.proxy.ftp", "webcache");'
+ AppendIfNoSuchLine 'pref("network.proxy.ftp_port", 3128);'
+ AppendIfNoSuchLine 'pref("network.proxy.http", "webcache");'
+ AppendIfNoSuchLine 'pref("network.proxy.http_port", 3128);'
+ AppendIfNoSuchLine 'pref("network.proxy.ssl", "webcache");'
+ AppendIfNoSuchLine 'pref("network.proxy.ssl_port", 3128);'
+ AppendIfNoSuchLine 'pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1, .intern");'
+ AppendIfNoSuchLine 'pref("network.proxy.type", 1);'
+ EndGroup
+
+ }
+
+ debian.workstation|debian.standalone::
+
+ { /etc/iceweasel/pref/iceweasel.js
+
+ BeginGroupIfNoSuchLine "// Set cache size"
+ AppendIfNoSuchLine '// Set cache size'
+ AppendIfNoSuchLine 'pref("browser.cache.disk.capacity", 5120);'
+ EndGroup
+
+ BeginGroupIfNoSuchLine "// Printer settings"
+ AppendIfNoSuchLine '// Printer Settings'
+ AppendIfNoSuchLine 'pref("print.postscript.print_size", "A4");'
+ AppendIfNoSuchLine 'pref("print.postscript.print_command", "kprinter");'
+ AppendIfNoSuchLine 'pref("print.print_command", "kprinter");'
+ EndGroup
+
+ BeginGroupIfNoSuchLine "// Mailto settings"
+ AppendIfNoSuchLine '// Mailto settings'
+ AppendIfNoSuchLine 'pref("network.protocol-handler.app.mailto", "icedove");'
+ EndGroup
+
+
+ }
+
diff -Nru /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cf.mozilla /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cf.mozilla
--- /tmp/WSYeLQz77q/debian-edu-config-1.416+svn39481/cf/cf.mozilla 2007-08-05 12:46:01.000000000 +0200
+++ /tmp/KPsh5vBD3t/debian-edu-config-1.416+svn39964/cf/cf.mozilla 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-#
-# Configure Proxy and Printer settings
-#
-
-editfiles:
-
- debian.installation.workstation::
-
- { /etc/mozilla-firefox/pref/firefox.js
-
- BeginGroupIfNoSuchLine "// Proxy Settings"
- AppendIfNoSuchLine '// Proxy Settings'
- AppendIfNoSuchLine 'pref("network.proxy.ftp", "webcache");'
- AppendIfNoSuchLine 'pref("network.proxy.ftp_port", 3128);'
- AppendIfNoSuchLine 'pref("network.proxy.http", "webcache");'
- AppendIfNoSuchLine 'pref("network.proxy.http_port", 3128);'
- AppendIfNoSuchLine 'pref("network.proxy.ssl", "webcache");'
- AppendIfNoSuchLine 'pref("network.proxy.ssl_port", 3128);'
- AppendIfNoSuchLine 'pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1, .intern");'
- AppendIfNoSuchLine 'pref("network.proxy.type", 1);'
- EndGroup
-
- }
-
- debian.workstation|debian.standalone::
-
- { /etc/mozilla-firefox/pref/firefox.js
-
- BeginGroupIfNoSuchLine "// Set cache size"
- AppendIfNoSuchLine '// Set cache size'
- AppendIfNoSuchLine 'pref("browser.cache.disk.capacity", 5120);'
- EndGroup
-
- BeginGroupIfNoSuchLine "// Printer settings"
- AppendIfNoSuchLine '// Printer Settings'
- AppendIfNoSuchLine 'pref("print.postscript.print_size", "A4");'
- AppendIfNoSuchLine 'pref("print.postscript.print_command", "kprinter");'
- AppendIfNoSuchLine 'pref("print.print_command", "kprinter");'
- EndGroup
-
- BeginGroupIfNoSuchLine "// Mailto settings"
- AppendIfNoSuchLine '// Mailto settings'
- AppendIfNoSuchLine 'pref("network.protocol-handler.app.mailto", "mozilla-thunderbird");'
- EndGroup
-
-
- }
-
Reply to: