Source: ltsp
Version: 5.18.12-1
Severity: important
Tags: patch

Hi,

while testing Debian Edu offline installation I noticed that the code I proposed
a while ago to determine the DIST value is working ok in testing, but will be
totally useless once Buster is stable.

The attached patch reverts the change; use 'lsb_release -s -c' again to detect
the codename. 

Please check.

Wolfgang
>From 57c25bc3a2ac224253265e9f7a149cb52c0a81db Mon Sep 17 00:00:00 2001
From: Wolfgang Schweer <[email protected]>
Date: Wed, 20 Mar 2019 18:40:32 +0100
Subject: [PATCH] Revert "Make
 'ltsp-build-client/Debian/000-basic-configuration' more robust."

This reverts commit 1a695ea6b4431fe628d1f36e410da636226fae24.

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 -s -c' is supposed to work in stable also
in standalone mode.
---
 .../plugins/ltsp-build-client/Debian/000-basic-configuration    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 30d04dcf..983605f4 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 -s -c)"}
         MIRROR=${MIRROR:-"http://deb.debian.org/debian"}
         COMPONENTS=${COMPONENTS:-"main"}
         EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
-- 
2.20.1

Reply via email to