[debian-edu-commits] debian-edu/ 04/15: Don't use /var/lib/apt/lists/ internals. (Closes: #874770).

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit da844775d293895873cabbcfed17932177be9b8c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 4 12:06:45 2018 +0100

    Don't use /var/lib/apt/lists/ internals. (Closes: #874770).
    
     cleanup share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source:
     LTSP doesn't use COPY_SOURCES_LIST by default anymore (for more details
     see #874775); also, the dropped code was needed in case of amd64 specials.
---
 .../Debian-custom/015-edu-apt-source                 | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source b/share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source
index d61766f..e36c797 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source
@@ -8,26 +8,6 @@ case "$MODE" in
             LTSP_CDROM_INSTALL=true
             APT_GET_OPTS="$APT_GET_OPTS \
                            --allow-unauthenticated -o acquire::check-valid-until=0"
-            # Make sure LTSP use a local repository if it is used by
-            # the system too.  FIXME Should really check the CD for list
-            # of components.
-            if grep ^deb /etc/apt/sources.list | grep ' local' ; then
-                COMPONENTS="$COMPONENTS local"
-            fi
-
-            # also disable gpg verification for debootstrap,
-            # used in ltsp 5.1.10-2
-            DEBOOTSTRAP_KEYRING=""
-        fi
-        ;;
-    after-install)
-        # Use same source list as the host system, modulo CDs
-        echo "Appending the host sources.list to ltsp sources.list."
-        grep -v cdrom: /etc/apt/sources.list >> $ROOT/etc/apt/sources.list
-        if [ "true" = "$LTSP_CDROM_INSTALL" ]; then
-            # purge Packages and Release files that debootstrap may have copied
-            # incorrectly, which prevents apt from fetching the correct files?
-            rm $ROOT/var/lib/apt/lists/*Packages $ROOT/var/lib/apt/lists/*Release || true
         fi
         ;;
 esac

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