From: Wolfgang Schweer <wschweer@arcor.de>
Date: Wed, 20 Mar 2019 18:50:13 +0000 (+0100)
Subject: ltsp: codename detection code not useful for stable (Closes: #925173).
X-Git-Tag: archive/raspbian/5.18.12-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4765acd70e0b6e86b74269afce109c5f289e36f1;p=ltsp.git

ltsp: codename detection code not useful for stable (Closes: #925173).

While it made sense to use /etc/debian_release in testing (the file contains
text like 'buster/sid') it fails to work in stable (the file content is a plain
version number like 9.8). 'lsb_release --short --codename' is supposed to work
in stable also in standalone mode.

(Vagrant Cascadian made minor edit to use longhand options consistent
with upstream).

Gbp-Pq: Name fix-codename-detection.patch
---

diff --git a/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration b/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration
index 30d04dc..d075d9d 100644
--- a/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration
+++ b/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration
@@ -2,7 +2,7 @@ case "$MODE" in
     configure)
         ARCH=${ARCH:-"$(dpkg --print-architecture)"}
         APT_GET_OPTS=${APT_GET_OPTS:-"-y"}
-        DIST=${DIST:-"$(cat /etc/debian_version | cut -d'/' -f1)"}
+        DIST=${DIST:-"$(lsb_release --short --codename)"}
         MIRROR=${MIRROR:-"http://deb.debian.org/debian"}
         COMPONENTS=${COMPONENTS:-"main"}
         EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}