[debian-edu-commits] debian-edu/ 01/01: Adjust Debian-custom/001-ltsp-settings to enable LTSP installation in case the usbstick ISO image is used. (Closes: #854203).

[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 89f5a13b24e4eef445ee646e252d12b753745f7e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Feb 5 01:30:13 2017 +0100

    Adjust Debian-custom/001-ltsp-settings to enable LTSP installation
    in case the usbstick ISO image is used. (Closes: #854203).
---
 debian/changelog                                                   | 7 +++++++
 .../ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0705de2..2cf7c18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-config (1.923) UNRELEASED; urgency=medium
+
+  * Adjust Debian-custom/001-ltsp-settings to enable LTSP installation
+    in case the usbstick ISO image is used. (Closes: #854203).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 05 Feb 2017 01:22:38 +0100
+
 debian-edu-config (1.922) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
index 58625e3..81946b3 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings
@@ -1,9 +1,10 @@
 # File Debian-custom/001-ltsp-settings
 # Deal with case that ltsp-client-builder doesn't look up another
 # mirror if cdrom is still mounted.
+# Lookup if ISO type is NETINST, not if usbstick (debian-cd BD disk type) ISO image is used.
 case $MODE in
   configure)
-    if [ file:///media/cdrom = "$option_mirror_value" ] ; then
+    if [ file:///media/cdrom = "$option_mirror_value" ] && ! grep -q BD /etc/apt/sources.list ; then
         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

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