[debian-edu-commits] debian-edu/ 01/01: Stop using our own apt archive on ftp.skolelinux.org, see #836375.
Holger Levsen
holger at layer-acht.org
Fri Sep 2 12:38:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-config.
commit c6ef9d6939ea1b1cbbe1f820ab89e7a0a910a338
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri Sep 2 14:38:06 2016 +0200
Stop using our own apt archive on ftp.skolelinux.org, see #836375.
* Stop using our own apt archive on ftp.skolelinux.org, see #836375:
- sbin/debian-edu-pxeinstall: remove workaround for Wheezy and stop
configuring our old archive for PXE installs.
- share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection:
don't configure our old repo.
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs: don't
install the old keyring package.
- share/debian-edu-config/tools/debian-edu-bless: stop using the old
repo.
- cf/cfengine.conf: test whether internet is reachable using
ftp.debian.org.
---
cf/cfengine.conf | 2 +-
debian/changelog | 16 +++++++++++++
sbin/debian-edu-pxeinstall | 26 ----------------------
share/debian-edu-config/tools/debian-edu-bless | 24 +++++---------------
.../Debian-custom/000-arch-detection | 9 --------
.../ltsp-build-client/Debian-custom/032-edu-pkgs | 2 +-
6 files changed, 23 insertions(+), 56 deletions(-)
diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index 3c1649e..14149a9 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -88,7 +88,7 @@ groups:
ltspclient = ( "/usr/bin/test -e /usr/bin/getltscfg" )
# Set if the internet is reachable for downloading files
- internet = ( "/usr/bin/wget -qO /dev/null http://ftp.skolelinux.org/welcome.msg " )
+ internet = ( "/usr/bin/wget -qO /dev/null http://ftp.debian.org/debian/README " )
###############################################################################
diff --git a/debian/changelog b/debian/changelog
index 09f3768..b6c89d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+debian-edu-config (1.910) UNRELEASED; urgency=medium
+
+ * Stop using our own apt archive on ftp.skolelinux.org, see #836375:
+ - sbin/debian-edu-pxeinstall: remove workaround for Wheezy and stop
+ configuring our old archive for PXE installs.
+ - share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection:
+ don't configure our old repo.
+ - share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs: don't
+ install the old keyring package.
+ - share/debian-edu-config/tools/debian-edu-bless: stop using the old
+ repo.
+ - cf/cfengine.conf: test whether internet is reachable using
+ ftp.debian.org.
+
+ -- Holger Levsen <holger at debian.org> Fri, 02 Sep 2016 14:23:58 +0200
+
debian-edu-config (1.909) unstable; urgency=medium
[ Frans Spiesschaert ]
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 55d4017..9df722c 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -56,7 +56,6 @@ fi
[ "$dist" ] || dist=$(debian-edu-current-codename)
[ "$archs" ] || archs="i386 amd64"
[ "$mirrorurl" ] || mirrorurl=http://httpredir.debian.org/debian
-[ "$archiveurl" ] || archiveurl=http://ftp.skolelinux.org/skolelinux
[ "$hostname" ] || hostname=pxeinstall
[ "$domain" ] || domain=intern
# Not hardcoded to allow PXE installation of a main-server without a
@@ -211,31 +210,6 @@ d-i netcfg/dhcp_ntp_servers string ntp
EOF
debconf-get-selections --installer | grep -w 'time/zone'
- if [ wheezy = "$dist" ] ; then
- # FIXME check if this workaround is still needed. It is
- # needed when the udebs we want to use during installation are
- # newer in our repository than in the official Debian
- # repository.
- cat <<EOF
-
-# Workaround for old udebs in Debian/Wheezy
-d-i preseed/early_command string anna-install dmidecode-udeb; export http_proxy="$http_proxy"; cd /tmp; archiveurl=$archiveurl; arch=i386; wget \$archiveurl/dists/$edudist/local/debian-installer/binary-\$arch/Packages; packages_file=Packages; desired_udebs="debian-edu-profile-udeb"; for file in \$(grep 'Filename:' \$packages_file | cut -d : -f 2); do udeb=\$(basename \$file | cut -d _ -f 1); for u in \$desired_udebs ; do if [ "\$u" = "\$udeb" ]; then url="\$archiveurl/\$file"; ech [...]
-EOF
- fi
-
- # Enable test repository during testing, but not for production
- if [ "$dist" != "$edudist" ] ; then
- cat <<EOF
-
-# Test install, activate test repository, uses local0 which is also
-# used by debian-edu-install, which will make sure a duplicate APT
-# source is not inserted into sources.list when doing test installs.
-d-i apt-setup/local0/repository string http://ftp.skolelinux.org/skolelinux $edudist local
-d-i apt-setup/local0/comment string Debian Edu $edudist repository
-d-i apt-setup/local0/source boolean true
-EOF
- fi
-
# No use copying the installation mirror setting if a DVD or USB
# stick was used.
if grep -qi 'dvd|bd' /etc/apt/sources.list ; then
diff --git a/share/debian-edu-config/tools/debian-edu-bless b/share/debian-edu-config/tools/debian-edu-bless
index f9dfca7..7ea3772 100755
--- a/share/debian-edu-config/tools/debian-edu-bless
+++ b/share/debian-edu-config/tools/debian-edu-bless
@@ -92,21 +92,7 @@ apt_get_harder() {
apt-get update
apt_get_harder "apt-get install -y etckeeper"
-# 1. Add skolelinux related APT sources if it exist
-MIRROR=ftp.skolelinux.org
-DIRECTORY=/skolelinux
-sourcefile=/etc/apt/sources.list.d/debian-edu.list
-if wget --timeout=30 --tries=3 -qO - http://$MIRROR$DIRECTORY/dists/$EDUSUITE/Release | grep -q " local/binary" ; then
- echo "info: Enabling our local APT source from $MIRROR."
- apt_get_harder "apt-get install -y debian-edu-archive-keyring"
- cat <<EOF > $sourcefile
-deb http://$MIRROR$DIRECTORY $EDUSUITE local
-deb-src http://$MIRROR$DIRECTORY $EDUSUITE local
-EOF
- apt-get update
-fi
-
-# 2. Create /etc/debian-edu/config with the wanted configuration.
+# 1. Create /etc/debian-edu/config with the wanted configuration.
mkdir -p /etc/debian-edu
cat <<EOF > /etc/debian-edu/config
VERSION="$VERSION"
@@ -118,11 +104,11 @@ EOF
if [ "true" = "$TESTINSTALL" ] ; then
echo 'TESTINSTALL="true"' >> /etc/debian-edu/config
fi
-# 3. Install debian-edu-install to load preseeding values and pull in
+# 2. Install debian-edu-install to load preseeding values and pull in
# our configuration.
apt_get_harder "apt-get install -y debian-edu-install"
-# 4. Preseed debconf database with profile setup in
+# 3. Preseed debconf database with profile setup in
# /etc/debian-edu/config, and run tasksel to install packages
# according to the profile specified in the config above,
# overriding some of the Debian automation machinery.
@@ -149,12 +135,12 @@ else
exit 1
fi
-# 5. Run debian-edu-cfengine-D installation to configure everything
+# 4. Run debian-edu-cfengine-D installation to configure everything
# that could not be done using preseeding.
cfengine-debian-edu -D installation
etckeeper commit "/etc/ state after running cfengine-debian-edu."
-# 6. Ask for a reboot to enable all the configuration changes.
+# 5. Ask for a reboot to enable all the configuration changes.
echo "It is now time to reboot. For example by running"
echo " shutdown -r now 'Into the great wide open'"
exit 0
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
index 9451e88..2c7d27e 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
@@ -28,15 +28,6 @@ case $MODE in
NEWMIRROR=$(awk '/^deb (http|ftp):\/\/.* main/ { if (!first) { print $2; first=1 } }' < /etc/apt/sources.list)
echo "info: Changing LTSP mirror from '$option_mirror_value' to '$NEWMIRROR'"
option_mirror_value=$NEWMIRROR
- if wget --timeout=30 --tries=3 -qO - http://ftp.skolelinux.org/skolelinux/dists/$option_dist_value/Release | grep -q " local/binary" ; then
- option_extra_mirror_value="http://ftp.skolelinux.org/skolelinux/ $option_dist_value local"
- echo "info: Added LTSP extra mirror '$option_extra_mirror_value'"
- fi
- NEWCOMPONENTS=$(echo $option_components_value | sed -r -e 's/(,local|local,)//')
- echo "info: Removing 'local' from components for other mirrors"
- option_components_value=$NEWCOMPONENTS
- echo "info: Adding Debian-Edu Archive key to apt-keys"
- option_apt_keys_value="$option_apt_keys_value,/usr/share/keyrings/debian-edu-archive-keyring.gpg"
if [ high = "$http_proxy" ]; then
unset http_proxy
echo "info: http_proxy was set to high, this seems to be a debconf bug, remove it"
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
index 955cf5a..89a046e 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
@@ -400,7 +400,7 @@ case "$MODE" in
# sudo-ldap (which fail due to #586887).
EARLY_PACKAGES="$EARLY_PACKAGES sudo-ldap"
- LATE_PACKAGES="$LATE_PACKAGES debian-edu-archive-keyring education-tasks"
+ LATE_PACKAGES="$LATE_PACKAGES education-tasks"
fi
fi
;;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list