[debian-edu-commits] debian-edu/ 01/01: Fix some tools now that debian-edu-current-codename has been dropped.

[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 5bb3bef79041cd2e496d5d41e9fe85e90e6901ae
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Oct 4 13:31:07 2016 +0200

    Fix some tools now that debian-edu-current-codename has been dropped.
    
        Replace 'debian-edu-current-codename' with 'lsb_release -sc'in:
        - sbin/debian-edu-ltsp
        - sbin/debian-edu-pxeinstall
        - share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
        - testsuite/doc
        Drop share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
        as it would be redundant after the same replacement.
    
        Adjust Makefile.
---
 Makefile                                                     |  1 -
 debian/changelog                                             | 12 ++++++++++++
 sbin/debian-edu-ltsp                                         |  2 +-
 sbin/debian-edu-pxeinstall                                   |  2 +-
 .../ltsp-build-client/Debian-custom/000-arch-detection       |  2 +-
 .../plugins/ltsp-build-client/Debian-custom/000-default-dist |  9 ---------
 testsuite/doc                                                |  2 +-
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 91a5a65..2702273 100644
--- a/Makefile
+++ b/Makefile
@@ -426,7 +426,6 @@ install: install-testsuite
 
 	set -e ; for f in \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/001-ltsp-settings \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/002-default-apt-keyring \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/010-set-resolver \
diff --git a/debian/changelog b/debian/changelog
index 2ce957d..2c9f492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
 debian-edu-config (1.913) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Drop debian-edu-hwsetup, we are going to use isenkram-cli instead.
     (See #839724)
   * Add .gitignore file to be able to ignore .nobackup.
 
+  [ Wolfgang Schweer ]
+  * Fix some tools now that debian-edu-current-codename has been dropped.
+    Replace 'debian-edu-current-codename' with 'lsb_release -sc'in:
+    - sbin/debian-edu-ltsp
+    - sbin/debian-edu-pxeinstall
+    - share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
+    - testsuite/doc
+    Drop share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
+    as it would be redundant after the same replacement.
+  * Adjust Makefile.
+
  -- Holger Levsen <holger at debian.org>  Sat, 01 Oct 2016 15:11:32 +0200
 
 debian-edu-config (1.912) unstable; urgency=medium
diff --git a/sbin/debian-edu-ltsp b/sbin/debian-edu-ltsp
index 16c4875..9eec85b 100644
--- a/sbin/debian-edu-ltsp
+++ b/sbin/debian-edu-ltsp
@@ -36,7 +36,7 @@ LC_ALL=C
 export LC_ALL
 
 test "$base" || base=/opt/ltsp
-test "$dist" || dist=$(debian-edu-current-codename)
+test "$dist" || dist=$(lsb_release -sc)
 
 if [ -d $base/$ARCH ] ; then
     echo "error: $base/$ARCH already exist.  Remove it before running $0"
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 9df722c..0d8d7e1 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -53,7 +53,7 @@ if [ -f /etc/environment ] ; then
     . /etc/environment
 fi
 
-[ "$dist" ]      || dist=$(debian-edu-current-codename)
+[ "$dist" ]      || dist=$(lsb_release -sc)
 [ "$archs" ]     || archs="i386 amd64"
 [ "$mirrorurl" ] || mirrorurl=http://httpredir.debian.org/debian
 [ "$hostname" ]  || hostname=pxeinstall
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 2c7d27e..2d98768 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
@@ -6,7 +6,7 @@ case $MODE in
 	ARCH=i386
 
 	if [ -z "$option_dist_value" ] ; then
-	    option_dist_value=$(debian-edu-current-codename)
+	    option_dist_value=$(lsb_release -sc)
 	    echo "info: Missing LTSP dist value, setting to $option_dist_value"
 	fi
 
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
deleted file mode 100644
index e07488a..0000000
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-default-dist
+++ /dev/null
@@ -1,9 +0,0 @@
-case $MODE in
-    configure)
-        if [  "$DIST" = "n/a" ]; then
-            # set distribution if lsb_release failed to figure it out
-            DIST=$(debian-edu-current-codename)
-            echo "Note: setting distribution to $DIST, as auto-detection failed."
-        fi
-    ;;
-esac
diff --git a/testsuite/doc b/testsuite/doc
index c422f12..6b3373c 100755
--- a/testsuite/doc
+++ b/testsuite/doc
@@ -4,7 +4,7 @@
 
 set -e
 
-suite=$(debian-edu-current-codename)
+suite=$(lsb_release -sc)
 capsuite=$(echo $suite | sed 's/\([a-z]\)\([a-zA-Z0-9]*\)/\u\1\2/g')
 
 docfile=/usr/share/doc/debian-edu-doc/en/debian-edu-$suite-manual.html

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