[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Stable update proposal: debian-edu-install 0.667.1+svn39198



I've uploaded a version of debian-edu-install with the new 3.0r1
version string, and propose we push this to the stable version as the
last package we push before wrapping up r1.

To summarize the changes:

  This version improve support for Adaptec RAID controllers using the
  dpt_i2o kernel module, update a few translations, fix a NAT related
  installation bug on thin clients, add /root/.svk/ to the backup set,
  and make sure the version string in /etc/debian-edu/config is
  updated for several old installations as well as 3.0r0.  It also
  make sure the architecture is reported by the netinst CD when
  checking if there is working network.

Here is the diff.  I removed the translation diff to reduce the length
and make it easier to review the functional changes.

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 36870)
+++ debian/changelog	(working copy)
@@ -1,3 +1,54 @@
+debian-edu-install (0.667.1+svn39198) terra; urgency=low
+
+  * Backport to Debian Edu/Etch.
+
+  [ Luk Claes ]
+  * Remove myself from uploaders.
+
+  [ Morten Werner Forsbring ]
+  * Changed my last name.
+  * Add /root/.svk to the default backup set (fixes Skolelinux bug #1272).
+  * Preseed debian-edu-config/enable-nat to enable NAT on the thin-client
+    servers (fixes Skolelinux bug #1266).
+  * Update the changelog to document fixing of bug #1266.
+
+  [ Petter Reinholdtsen ]
+  * Adjust user agent string used during installation to include
+    the Debian Edu suite and architecture information.
+  * Update German translation from Helge Kreutzmann. (Closes: #434097)
+  * Make sure to only try to load the dpt_i2o kernel module for PCI
+    device 1044:a511 (and not the i2o_core module), to avoid boot
+    problem after the install.  (Closes skolelinux bug #484 and #1254)
+  * Try harder to only load dpt_i2o for PCI device 1044:a511.  Make sure the
+    modprobe.d/blacklist entries are passed into /target/ as well.
+  * Only load dpt_i2o for PCI device 1044:a501, as it seem to be
+    supported by i2o_core too.
+  * Move modprobe.d fragment from file blacklist to
+    debian-edu-install, to avoid conflict with the udev package.
+  * Change dpt_i2o handling code to only trigger when the dpt_i2o
+    kernel module is present, to try to make it forward compatible
+    with the planned fix in Debian.
+  * Move current version string to
+    /usr/lib/debian-edu-install/version, to avoid duplicating it in
+    both debian-edu-preseed and debian/debian-edu-install.postinst.
+  * Make sure to upgrade Debian Edu version string from the 'alpha',
+    'test' and 'pre' versions too.
+  * Add support for upgrading versions strings with space in them, to
+    handle the transition from '3.0r0 terra' to '3.0r1 terra'.
+  * Change version string to '3.0r1 terra'.
+
+  [ Bart Cornelis (cobaco) ]
+  * Updated Dutch translation
+
+  [ Patrick Winnertz ]
+  * Added russian debconf translation. (Closes: #434198)
+    Thanks to Yuri Kozlov.
+
+  [ HÃ¥vard Korsvoll ]
+  * Completed Norwegian Nynorsk translation.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 25 Nov 2007 10:33:58 +0100
+
 debian-edu-install (0.667.0.edu.etch.1) terra; urgency=low
 
   * Backport to Debian Edu/Etch.
Index: debian/control
===================================================================
--- debian/control	(revision 36870)
+++ debian/control	(working copy)
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Debian Edu Developers <debian-edu@lists.debian.org>
-Uploaders: Petter Reinholdtsen <pere@debian.org>, Andreas Schuldei <andreas@debian.org>, Joey Hess <joeyh@debian.org>, Morten Werner Olsen <werner@debian.org>, Luk Claes <luk@debian.org>, Steffen Joeris <white@debian.org>, Holger Levsen <holger@debian.org>
+Uploaders: Petter Reinholdtsen <pere@debian.org>, Andreas Schuldei <andreas@debian.org>, Joey Hess <joeyh@debian.org>, Morten Werner Forsbring <werner@debian.org>, Steffen Joeris <white@debian.org>, Holger Levsen <holger@debian.org>
 Build-Depends: debhelper (>= 4.1.13), po-debconf (>= 0.5.0)
 Build-Depends-Indep: dpkg-dev (>= 1.9), dash
 Standards-Version: 3.7.2
Index: debian/debian-edu-install.postinst
===================================================================
--- debian/debian-edu-install.postinst	(revision 36870)
+++ debian/debian-edu-install.postinst	(working copy)
@@ -15,17 +15,30 @@
 . /usr/share/debconf/confmodule
 
 debian_edu_config="/etc/debian-edu/config"
-oldversions="sarge terra_pre02 terra_rc1 terra_rc2 terra_rc3 terra_rc4"
+oldversions="sarge \
+  terra_alpha \
+  terra_test01 terra_test02 terra_test03 terra_test04 \
+  terra_pre01 terra_pre02 \
+  terra_rc1 terra_rc2 terra_rc3 terra_rc4 terra_rc5"
 
 # For the stable etch release, use '3.0r0 terra' as the version number
-new_version="terra_rc5"
+new_version="$(cat /usr/lib/debian-edu-install/version)"
 
 if [ -f $debian_edu_config ] ; then
-	for i in $oldversions ; do
-		if grep -q $i $debian_edu_config ; then
-			sed -i $debian_edu_config -e "s/$i/$new_version/"
+	( # Subshell to avoid importing the variables into the entire script
+	VERSION=""
+	. $debian_edu_config
+
+	# Need to list versions with space here, to avoid unwanted
+	# word splitting
+	for i in $oldversions # '3.0r0 terra'
+	do
+		if [ "$VERSION" = "$i" ] ; then
+			sed -i $debian_edu_config -e \
+				"s/^VERSION=.*$/VERSION=\"$new_version\"/"
 		fi
 	done
+	)
 fi
 
 # Insert firstboot script in the boot sequence if the package is
Index: debian/rules
===================================================================
--- debian/rules	(revision 36870)
+++ debian/rules	(working copy)
@@ -79,6 +79,7 @@
 	done
 	$(INSTALL) debian-edu-profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin
 	touch $(CURDIR)/debian/debian-edu-profile-udeb/etc/uselvm
+	$(INSTALL) version $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install
 
 # Build architecture-independent files here.
 binary-indep: install debian-edu-install debian-edu-install-udeb debian-edu-profile-udeb
Index: debian/debian-edu-install-udeb.isinstallable
===================================================================
--- debian/debian-edu-install-udeb.isinstallable	(revision 36870)
+++ debian/debian-edu-install-udeb.isinstallable	(working copy)
@@ -24,8 +24,22 @@
 # Avoid to get eth1394 set to be eth0 by udev during hardware detect
 # otherwise /etc/udev/rules.d/z25_persistent-net.rules makes eth1394
 # always eth0
-echo "blacklist eth1394" >>/etc/modprobe.d/blacklist
+echo "blacklist eth1394" >>/etc/modprobe.d/debian-edu-install
 
+# Force the use of dpt_i2o for devices where both it and i2o_core can
+# support the card, to avoid device name confusion.  Skolelinux bug
+# #484 and #1254.
+if [ -f /lib/modules/$(uname -r)/kernel/drivers/scsi/dpt_i2o.ko ] ; then
+    if lspci -n | grep -q " 1044:a511 " ||
+	lspci -n | grep -q " 1044:a501 " ; then
+	cat >>/etc/modprobe.d/debian-edu-install <<EOF 
+# Make sure dpt_i2o is used for PCI device also supported by i2o_core
+blacklist i2o_core
+blacklist i2o_block
+EOF
+    fi
+fi
+
 # Avoid questions which are overriden by init.d/update-hostname and
 # DHCP.  Must do it here, because netcfg runs before the
 # debian-edu-install postinst.  This should only be done for
Index: debian/po/ru.po
===================================================================
--- debian/po/ru.po	(revision 0)
+++ debian/po/ru.po	(revision 39197)
@@ -0,0 +1,475 @@
[...]
Index: debian/po/nl.po
===================================================================
--- debian/po/nl.po	(revision 36870)
+++ debian/po/nl.po	(working copy)
@@ -43,8 +43,8 @@
[...]
Index: debian/po/nn.po
===================================================================
--- debian/po/nn.po	(revision 36870)
+++ debian/po/nn.po	(working copy)
@@ -1,38 +1,11 @@
[...]
Index: debian/po/de.po
===================================================================
--- debian/po/de.po	(revision 36870)
+++ debian/po/de.po	(working copy)
@@ -1,34 +1,21 @@
[...]
Index: version
===================================================================
--- version	(revision 0)
+++ version	(revision 39197)
@@ -0,0 +1 @@
+3.0r1 terra
Index: debian-edu-preseed
===================================================================
--- debian-edu-preseed	(revision 36870)
+++ debian-edu-preseed	(working copy)
@@ -30,9 +30,11 @@
 fi
 
 # For the stable etch release, use '3.0r0 terra' as the version number
+VERSION="$(cat /usr/lib/debian-edu-install/version)"
+
 (
     echo "# Generated by debian-edu-profile-udeb"
-    echo "VERSION=terra_rc5"
+    echo "VERSION=\"$VERSION\""
     echo "PROFILE=\"$PROFILE\""
     echo "LANGCODE=\"$LANGCODE\""
     echo "LOCALE=\"$LOCALE\""
@@ -230,12 +232,33 @@
     fi
 }
 
+# Make sure to propagate the dpt_i2o related blacklist from d-i
+# to /target/.  See debian-edu-install-udeb.isinstallable for the
+# other part of this fix.  Skolelinux bug #484 and #1254.
+handle_adaptec_raid() {
+    mpfile=/etc/modprobe.d/debian-edu-install
+    if grep -q "^blacklist i2o_core" $mpfile  ; then
+	if grep -q "^blacklist i2o_core" /target$mpfile ; then
+	    :
+	else
+	    cat >> /target$mpfile <<EOF 
+# Make sure dpt_i2o is used for PCI device also supported by i2o_core
+blacklist i2o_core
+blacklist i2o_block
+EOF
+	fi
+    fi
+}
+
 configure_network
 
+handle_adaptec_raid
+
 # Munin hangs during installation if bind is not working during installation
 # Debian BTS #275024
 # Setting the wanted named.conf before bind is installed seems to work
-# around the problem
+# around the problem.  XXX This should be moved to the cfengine rules.
+# It is needed on the live CD too.
 if [ "tjener.intern" = "$HOSTNAME" -a ! -f /target/etc/bind/named.conf ] ; then
   mkdir -p /target/etc/bind
   # try to avoid symlinking the configfile.
Index: debian-edu-profile
===================================================================
--- debian-edu-profile	(revision 36870)
+++ debian-edu-profile	(working copy)
@@ -402,6 +402,7 @@
 db_register debian-installer/dummy apt-setup/local0/comment
 db_register debian-installer/dummy apt-setup/local0/source
 
+archstr=$(/bin/archdetect)
 if grep -iq dvd /cdrom/.disk/cd_type ; then
     #disable mirror useage if we install from dvd
     db_set "apt-setup/use_mirror" false 
@@ -412,7 +413,7 @@
     db_set "apt-setup/local0/repository" "http://ftp.skolelinux.org/skolelinux/ $de_suite local" || true
     db_set "apt-setup/local0/source" true || true
 
-elif ! wget --header "User-Agent: Debian Edu d-i $DISTRIBUTION" -qO - http://ftp.skolelinux.org/welcome.msg ; then
+elif ! wget --header "User-Agent: Debian Edu d-i $de_suite $archstr" -qO - http://ftp.skolelinux.org/welcome.msg ; then
     #disable mirror useage if network is unreachable
     db_set "apt-setup/use_mirror" false
     db_fset "apt-setup/use_mirror" seen true || true
Index: Makefile
===================================================================
--- Makefile	(revision 36870)
+++ Makefile	(working copy)
@@ -67,6 +67,7 @@
 	for fil in $(SBINFILES); do \
 	  $(INSTALL) tools/$$fil $(DESTDIR)$(sbindir)/$$fil; \
 	done
+	$(INSTALL_DATA) version $(DESTDIR)$(pkglibdir)
 
 debian-edu-profile.templates: debian/debian-edu-profile-udeb.templates
 	(cd debian; po2debconf debian-edu-profile-udeb.templates) > $@
@@ -105,7 +106,7 @@
 
 status:
 	( for f in debian/po/*.po; do \
-		echo -n $$f:; msgfmt --statistics $$f 2>&1 ; \
+		echo -n $$f:; msgfmt --statistics -o /dev/null $$f 2>&1 ; \
 	done ) | egrep 'fuzzy|untranslated'
 dist:
 	debuild -us -uc
Index: README
===================================================================
--- README	(revision 36870)
+++ README	(working copy)
@@ -79,16 +79,16 @@
   Profile main-server + thinclient-server (91edumain+ltsp):
 
   Partition            amd64 DVD     i386 CD    i386 DVD
-                      2007-07-09  2007-07-18  2007-07-07
+                      2007-10-25  2007-07-27  2007-10-24
   ------------------------------------------------------
-  /                           95          82          80
+  /                           98          82          80
   /boot                       19          18          18
-  /opt                       513         517         512
-  /skole/backup               17          11          17
-  /skole/tjener/home0         36          17          34
-  /usr                      3072        2912        2911
-  /var                       249         851         218
-  /var/opt/ltsp/swapfiles     67          17          34
+  /opt                       554         525         516
+  /skole/backup               35          17          17
+  /skole/tjener/home0        173          17          35
+  /usr                      3204        3055        3051
+  /var                       328         912         257
+  /var/opt/ltsp/swapfiles     69          17          34
   /var/spool/squid            10          10          10
 
   Profile main-server + workstation (92edumain+ws):
Index: base-config/defaults.thin-client-server
===================================================================
--- base-config/defaults.thin-client-server	(revision 36870)
+++ base-config/defaults.thin-client-server	(working copy)
@@ -5,7 +5,7 @@
 
 # for slbackup (shall just be needed/used when installing a combined
 # main-server+thin-client-server)
-slbackup slbackup/client_location string /etc /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups
+slbackup slbackup/client_location string /etc /root/.svk /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups
 
 # Set up atftpd to serve the kernels
 atftpd atftpd/multicast boolean false
@@ -27,3 +27,5 @@
 d-i ltsp-client-builder/unsigned-archive boolean true
 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --components main,local --accept-unsigned-packages --dist etch --late-packages sitesummary-client,debian-edu-artwork,debian-edu-artwork-usplash,debian-edu-archive-keyring,ltspfsd --debconf-seeds /usr/lib/debian-edu-install/defaults.ltsp-chroot
 
+# enable NAT on thin-client-network
+debian-edu-config debian-edu-config/enable-nat boolean true
Index: base-config/defaults.main-server
===================================================================
--- base-config/defaults.main-server	(revision 36870)
+++ base-config/defaults.main-server	(working copy)
@@ -44,7 +44,7 @@
 slbackup slbackup/client_name string tjener
 slbackup slbackup/client_type select local
 slbackup slbackup/client_address string tjener
-slbackup slbackup/client_location string /etc /skole/tjener/home0 /var/backups
+slbackup slbackup/client_location string /etc /root/.svk /skole/tjener/home0 /var/backups
 slbackup slbackup/client_user string root
 slbackup slbackup/client_keep string 185
 



Reply to: