[debian-edu-commits] debian-edu/ 01/01: base-installer: drop code disabled since 2012.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-install.

commit 27e6ce91ea865f30e161e6f5d92cdfbfed1b3cac
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 14 11:20:36 2017 -0400

    base-installer: drop code disabled since 2012.
---
 base-installer   | 40 ----------------------------------------
 debian/changelog |  1 +
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/base-installer b/base-installer
index b18de8d..b092cab 100755
--- a/base-installer
+++ b/base-installer
@@ -26,46 +26,6 @@ if [ -e /dev/$VG/debianedufreespace ] ; then
     fi
 fi
 
-# Expand overfull file systems during installation, until /target is umounted.
-# Disabled 2012-01-28 as lvextend in chroot hang forever and block grub from
-# completing the installation.  FIXME figure out why and fix or remove this code.
-if false ; then
-(
-    # Make sure debian-edu-fsautoresize uses the same time zone as the
-    # installer when running during installation (Solves Skolelinux
-    # bug #1356), to avoid inconsistent time stamps in the
-    # installation log.
-    TZ=UTC
-    export TZ
-
-    # Workaround for in-target not accepting arguments as part of the command
-    # to run.  Need to create a temporary script that can be executed without
-    # arguments.  Can not create it in /target/tmp/, as it does not exist yet.
-    # In Lenny, in-target handle arguments.  This workaround can be
-    # removed and the code made simpler. [pere 2009-12-14]
-    # FIXME Rewrite with the new in-target support.
-    script=/debian-edu-extend-file-systems
-    if [ ! -f $script ] ; then  # Avoid several loops running at the same time
-        cat > /target$script <<EOF
-#!/bin/sh
-/usr/sbin/debian-edu-fsautoresize -n
-EOF
-        chmod a+rx /target$script
-        while [ -x /target$script ]; do
-            if [ -x /target/usr/sbin/debian-edu-fsautoresize ] && [ -x /target/usr/bin/perl ]; then
-                # Avoid in-target, as it can not run in parallel with
-                # apt-install or in-target
-                chroot /target $script || true
-            fi
-            sleep 10
-        done
-        # $script is removed in finish-install.d script
-    fi
-    # Close as many file descriptors as possible, to reduce the chance
-    # of message leaks to debconf
-) < /dev/null > /dev/null 2>&1 3>&1 4>&1 5>&1 6>&1 7>&1 8>&1 9>&1 &
-fi
-
 # Need to do this here, as apt need to work via Squid to install
 # debian-edu-config where the permanent file is included.
 # FIXME check if this still is needed.  See BTS report #565555.
diff --git a/debian/changelog b/debian/changelog
index 6901b18..43bdba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ debian-edu-install (1.917) UNRELEASED; urgency=medium
     - update version number in /etc/debian-edu/config on upgrades.
   * Bump version file to 10+edu0~a0 to reflect that we are working on Buster
     now.
+  * base-installer: drop code disabled since 2012. 
 
  -- Holger Levsen <holger at debian.org>  Sat, 05 Aug 2017 17:58:22 -0400
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git