Bug#770121: unblock: debian-edu-install/1.818 (update version number and avoid bogus error message)
Control: tags -1 d-i
Hi,
On Wed, Nov 19, 2014 at 12:57:13AM +0100, Petter Reinholdtsen wrote:
> Please unblock package debian-edu-install to update the Debian Edu
> version number in Jessie and avoid a bogus error message from being
> shown to users testing the system (bug #770110). The eatmydata
> disabling and enabling were due to a bug in libeatmydata now fixed in
> testing, and thus the quick installation part can be left alone like it
> already is in testing.
>
> This is the complete source code change uploaded to unstable some
> minutes ago.
This one needs a d-i ack.
Cheers,
Ivo
> diff --git a/debian/changelog b/debian/changelog
> index 26509c4..686e92f 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,24 @@
> +debian-edu-install (1.818) unstable; urgency=low
> +
> + * Re-enable eatmydata during installation now that bug #765694 is fixed
> + in unstable and accepted for testing.
> + * Adjust edu-eatmydata-install to not report an error when eatmydata
> + already is activated, but instead log that it is already in place.
> + This avoid a bogus error being reported to those testing Debian
> + Edu Jessie (Closes: #770110).
> +
> + -- Petter Reinholdtsen <pere@debian.org> Wed, 19 Nov 2014 00:41:44 +0100
> +
> +debian-edu-install (1.817) unstable; urgency=low
> +
> + * Disable eatmydata for quick install for both the normal and LTSP
> + installation until eatmydata on i386 work properly. Workaround
> + for bug #765694.
> + * Update version number to 8.0+edu0~alpha1 in preparation of a new
> + alpha release.
> +
> + -- Petter Reinholdtsen <pere@debian.org> Sun, 09 Nov 2014 11:59:31 +0100
> +
> debian-edu-install (1.816) unstable; urgency=medium
>
> * Change current version number to 8.0+edu0~alpha0 in preparation
> diff --git a/debian/debian-edu-install.postinst b/debian/debian-edu-install.postinst
> index 2db3442..6db5c80 100644
> --- a/debian/debian-edu-install.postinst
> +++ b/debian/debian-edu-install.postinst
> @@ -153,7 +153,7 @@ if [ -f $debian_edu_config ] ; then
> '6.0.4+edu0 rc3' '6.0.4+edu+r0' '6.0.7+edu+r1' \
> '7.0.0+edu+alpha0' '7.0.0+edu+alpha2' '7.0.0+edu+alpha3' \
> '7.1+edu0~a3' '7.1+edu0~b0' '7.1+edu0~b1' '7.1+edu0~b2' \
> - '7.1+edu0' '8.0.0+edu+alpha0' '8.0+edu+alpha0'
> + '7.1+edu0' '8.0.0+edu+alpha0' '8.0+edu+alpha0' '8.0+edu0~alpha0'
> do
> if [ "$VERSION" = "$i" ] ; then
> sed -i $debian_edu_config -e \
> diff --git a/tools/edu-eatmydata-install b/tools/edu-eatmydata-install
> index da82d6d..9ab19c2 100755
> --- a/tools/edu-eatmydata-install
> +++ b/tools/edu-eatmydata-install
> @@ -19,8 +19,8 @@ trap at_exit INT TERM EXIT
>
> enable_override() {
> apt-install eatmydata || true
> - if [ -x /target/usr/bin/eatmydata ] && \
> - [ ! -f /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata ]; then
> + if [ -x /target/usr/bin/eatmydata ] ; then
> + if [ ! -f /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata ]; then
> info "Adding apt config to call dpkg via eatmydata"
> printf "#!/bin/sh\nexec eatmydata dpkg \"\$@\"\n" \
> > /target/var/tmp/dpkg-eatmydata
> @@ -28,6 +28,9 @@ enable_override() {
> cat > /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata <<EOF
> Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
> EOF
> + else
> + info "apt redirect for eatmydata already in place"
> + fi
> else
> error "unable to find /usr/bin/eatmydata after installing the eatmydata package"
> fi
> diff --git a/version b/version
> index a932e22..6e42e5a 100644
> --- a/version
> +++ b/version
> @@ -1 +1 @@
> -8.0+edu0~alpha0
> +8.0+edu0~alpha1
Reply to: