[debian-edu-commits] debian-edu/ 01/01: Make changes needed for renaming the thin-client-server profile to ltsp-server-profile (see #588510).

Holger Levsen holger at layer-acht.org
Fri Dec 2 12:57:55 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 006468a3e1d426ff6cccc75b91b4f7c797d95056
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 2 13:55:39 2016 +0100

    Make changes needed for renaming the thin-client-server profile to ltsp-server-profile (see #588510).
    
    Some occurrences of Thin-Client-Server are still left in the code to support
    upgrades of systems installed before Stretch.
---
 README                                             | 4 ++--
 debian/changelog                                   | 9 +++++++++
 debian/debian-edu-config.firefox-ldapconf          | 4 ++--
 debian/debian-edu-config.postinst                  | 4 ++--
 doc/debian-edu-winbind                             | 2 +-
 etc/X11/Xsession.d/09debian-edu-missing-home       | 4 ++--
 etc/dhcp/dhclient-exit-hooks.d/hostname            | 2 +-
 sbin/debian-edu-pxeinstall                         | 2 +-
 share/debian-edu-config/d-i/pre-pkgsel             | 4 ++--
 share/debian-edu-config/tools/debian-edu-bless     | 2 +-
 share/debian-edu-config/tools/show-welcome-webpage | 2 +-
 testsuite/dhcpd                                    | 2 +-
 testsuite/ldap-client                              | 4 ++--
 testsuite/ltsp                                     | 2 +-
 testsuite/network                                  | 6 +++---
 testsuite/nfs-server                               | 4 ++--
 testsuite/ntp                                      | 2 +-
 testsuite/rdp-server                               | 4 ++--
 testsuite/syslog                                   | 4 ++--
 testsuite/taskpkgs                                 | 4 ++--
 testsuite/webcache                                 | 2 +-
 testsuite/webserver                                | 2 +-
 testsuite/workstation                              | 2 +-
 23 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/README b/README
index 16a21fa..9508a46 100644
--- a/README
+++ b/README
@@ -78,14 +78,14 @@ syslog (rsyslog)
 ----------------
 
   The main-server profile is configured as a syslog message collector,
-  and all clients (workstation and thin-client-server) is configured
+  and all clients (workstation and ltsp-server) is configured
   to send all syslog messages to the host behind the DNS name syslog.
 
 NTP clients and server
 ----------------------
 
   The main-server profile is configured as a publicly available NTP
-  server, and the workstation and thin-client-server profiles are
+  server, and the workstation and ltsp-server profiles are
   configured as NTP clients using the host behind the DNS name ntp as
   their NTP server.
 
diff --git a/debian/changelog b/debian/changelog
index ea82c7e..8acb3c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian-edu-config (1.919) UNRELEASED; urgency=medium
+
+  * Make changes needed for renaming the thin-client-server profile to
+    ltsp-server-profile (see #588510). 
+    Some occurrences of Thin-Client-Server are still left in the code to
+    support upgrades of systems installed before Stretch.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 02 Dec 2016 13:45:21 +0100
+
 debian-edu-config (1.918) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-config.firefox-ldapconf b/debian/debian-edu-config.firefox-ldapconf
index 49bcf88..91c4753 100755
--- a/debian/debian-edu-config.firefox-ldapconf
+++ b/debian/debian-edu-config.firefox-ldapconf
@@ -31,11 +31,11 @@ do_start() {
     fi
 
     # Only networked profiles use LDAP
-    if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+    if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Thin-Client-Server|Minimal' ; then
 	/usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
     fi
 
-    if echo "$PROFILE" | grep -q Thin-Client-Server  && [ -d /opt/ltsp ] ; then
+    if echo "$PROFILE" | grep -q LTSP-Server  && [ -d /opt/ltsp ] ; then
 	for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
 	    chroot $ltsp_chroot /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
 	done
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 21ba243..b353fc6 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -131,7 +131,7 @@ db_stop
 
 
 # start the enable-nat init script if we have a ltspserver
-if [ -f /etc/debian-edu/config ] && grep -q Thin-Client-Server /etc/debian-edu/config ; then
+if [ -f /etc/debian-edu/config ] && egrep -q "(LTSP-Server|Thin-Client-Server)" /etc/debian-edu/config ; then
 	if ! grep -q Main-Server /etc/debian-edu/config ; then
 		if [ -x "`which invoke-rc.d 2>/dev/null`" ] ; then
 			invoke-rc.d enable-nat start || exit $?
@@ -191,7 +191,7 @@ configure)
 		ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
 		if ! [ -e /etc/ltsp_chroot ] ; then
 		    /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
-		    if grep -q Thin-Client-Server /etc/debian-edu/config && [ -d /opt/ltsp ] ; then
+		    if egrep -q "(LTSP-Server|Thin-Client-Server)" /etc/debian-edu/config && [ -d /opt/ltsp ] ; then
 			for ltsp_chroot in `find /opt/ltsp/ -mindepth 1 -maxdepth 1 -type d`; do
 			    chroot $ltsp_chroot /usr/share/debian-edu-config/tools/update-firefox-homepage ldap:homepage
 			done
diff --git a/doc/debian-edu-winbind b/doc/debian-edu-winbind
index 1283e9c..0dcb8eb 100644
--- a/doc/debian-edu-winbind
+++ b/doc/debian-edu-winbind
@@ -140,6 +140,6 @@ Things that have gone wrong before:
   using "host server" should give you some help.
 - gateway for diskless clients. Debian-edu uses ltspserver as the gateway
   for the thin client network. this must resolv. It may be sufficient to
-  just edit /etc/hosts on the thin-client-server
+  just edit /etc/hosts on the ltsp-server
 
 
diff --git a/etc/X11/Xsession.d/09debian-edu-missing-home b/etc/X11/Xsession.d/09debian-edu-missing-home
index ae74cdd..7df3c1d 100755
--- a/etc/X11/Xsession.d/09debian-edu-missing-home
+++ b/etc/X11/Xsession.d/09debian-edu-missing-home
@@ -1,10 +1,10 @@
 #!/bin/sh
 # Give a clue to why the home directory is missing.
 
-# Should not update hostname on Main-Server, Roaming-Workstation and Standalone
+# Should not run on Main-Server, Roaming-Workstation and Standalone
 if [ -r /etc/debian-edu/config ] ; then
     . /etc/debian-edu/config
-    if echo "$PROFILE" | egrep -q 'Workstation|Thin-Client-Server|Minimal' ; then
+    if echo "$PROFILE" | egrep -q 'Workstation|LTSP-Server|Thin-Client-Server|Minimal' ; then
 	if [ ! -d $HOME -o / = "$HOME" ] ; then
 	    cat <<EOF | \
 		xmessage -buttons Understood:0 -timeout 30 -center -file - 
diff --git a/etc/dhcp/dhclient-exit-hooks.d/hostname b/etc/dhcp/dhclient-exit-hooks.d/hostname
index 27193f8..ae6718d 100755
--- a/etc/dhcp/dhclient-exit-hooks.d/hostname
+++ b/etc/dhcp/dhclient-exit-hooks.d/hostname
@@ -22,7 +22,7 @@ fi
 if echo "$PROFILE" | egrep -q 'Main-Server|Roaming-Workstation|Standalone' ; then
 	exit 0
 	else
-	    if echo "$PROFILE" | egrep -q 'Workstation|Thin-Client-Server|Minimal' ; then
+	    if echo "$PROFILE" | egrep -q 'Workstation|LTSP-Server|Thin-Client-Server|Minimal' ; then
 	        :
 	    fi
 fi
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index 97436a1..b26b796 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -192,7 +192,7 @@ d-i     mirror/ftp/proxy        string  $ftp_proxy
 #d-i     debian-edu-install/participate-popcon boolean true
 
 # If you want a specific set of profiles installed
-#d-i	debian-edu-install/profile multiselect Workstation, Thin-Client-Server
+#d-i	debian-edu-install/profile multiselect Workstation, LTSP-Server
 
 # If you want automatic partitioning
 #d-i	debian-edu-install/confirm boolean true
diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index c60d883..fac2ead 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -96,7 +96,7 @@ EOF
 		NAMESERVER=127.0.0.1
 		autoeth0="auto eth0"
 		;;
-	    Thin-Client-Server)
+	    LTSP-Server)
  	        # Use this unless Server also was choosen.
 		if [ -z "$eth0" ] ; then
 		    eth0=dhcp
@@ -341,7 +341,7 @@ edu-etcvcs commit
 for p in $(echo $PROFILE | tr , " ") ; do
     case $p in
 	# Only do this for the networked tasks, not for standalone
-	Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal)
+	Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal)
 	    set_kerberos_ldap_passwords
 	    #create_initial_localadmin_user
 	    in-target /usr/share/debian-edu-config/tools/preseed-ldap-kerberos
diff --git a/share/debian-edu-config/tools/debian-edu-bless b/share/debian-edu-config/tools/debian-edu-bless
index 7ea3772..25ee212 100755
--- a/share/debian-edu-config/tools/debian-edu-bless
+++ b/share/debian-edu-config/tools/debian-edu-bless
@@ -33,7 +33,7 @@ export SUDO_FORCE_REMOVE=yes
 
 # Set up this (or these) profile(s)
 # Possible values, can be combined using comma
-#   Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server,
+#   Main-Server, Workstation, Roaming-Workstation, LTSP-Server,
 #   Minimal, Standalone
 PROFILE="${PROFILE:-Workstation}"
 
diff --git a/share/debian-edu-config/tools/show-welcome-webpage b/share/debian-edu-config/tools/show-welcome-webpage
index c1e9fa5..d45aaa5 100755
--- a/share/debian-edu-config/tools/show-welcome-webpage
+++ b/share/debian-edu-config/tools/show-welcome-webpage
@@ -13,7 +13,7 @@ if [ -e /etc/debian-edu/config ] ; then
 fi
 
 if [ "$GETDEFAULTHOMEPAGE" ] &&
-    echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+    echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
     for lang in $(echo $LANGCODE | tr : " "); do
 	if wget -q -O /dev/null ${GETDEFAULTHOMEPAGE}index.html.$lang ; then
             welcomeurl="${GETDEFAULTHOMEPAGE}index.html.$lang"
diff --git a/testsuite/dhcpd b/testsuite/dhcpd
index 967b838..474e772 100755
--- a/testsuite/dhcpd
+++ b/testsuite/dhcpd
@@ -7,7 +7,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only main-server and thin-client server profiles run dhcpd
-if echo "$PROFILE" | egrep -q 'Main-Server|Thin-Client-Server' ; then
+if echo "$PROFILE" | egrep -q 'Main-Server|LTSP-Server' ; then
     :
 else
     exit 0
diff --git a/testsuite/ldap-client b/testsuite/ldap-client
index 44cd882..bfdbc8d 100755
--- a/testsuite/ldap-client
+++ b/testsuite/ldap-client
@@ -16,7 +16,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only networked profiles use LDAP
-if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
     :
 else
     exit 0
@@ -218,7 +218,7 @@ if [ -r /etc/sssd/sssd.conf ]  ; then
     fi
 fi
 
-if echo "$PROFILE" | egrep -q 'Thin-Client-Server' ; then
+if echo "$PROFILE" | egrep -q 'LTSP-Server' ; then
     check_file_perm \
 	/opt/ltsp/i386/etc/ldap/ssl/ldap-server-pubkey.pem 644
 fi
diff --git a/testsuite/ltsp b/testsuite/ltsp
index 502e739..c26bbb4 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -17,7 +17,7 @@ error() {
     echo "error: $0: $*"
 }
 
-if echo "$PROFILE" | grep -q Thin-Client-Server ; then
+if echo "$PROFILE" | grep -q LTSP-Server ; then
     chroot="/opt/ltsp/$LTSPARCH"
     if [ -f $chroot/etc/lts.conf ] ; then
 	success "Found LTSP chroot"
diff --git a/testsuite/network b/testsuite/network
index 46675cd..aeb7f77 100755
--- a/testsuite/network
+++ b/testsuite/network
@@ -78,7 +78,7 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
         networked=true
         workstation=true
         ;;
-      Thin-Client-Server|LTSP-server)
+      LTSP-server)
         networked=true
         workstation=true
         ltspserver=true
@@ -101,11 +101,11 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 done
 
 if test "$networked" = true && ! have_interface eth0 ; then
-    error "Missing network interface eth0 needed by the main server, thin client server and workstation."
+    error "Missing network interface eth0 needed by the main server, LTSP server and workstation."
 fi
 
 if test "$ltspserver" = true && ! have_interface eth1 ; then
-    error "Missing network interface eth1 needed by the thin client server."
+    error "Missing network interface eth1 needed by the LTSP server."
 fi
 
 if test "$networked" = true -a "$server" != true ; then
diff --git a/testsuite/nfs-server b/testsuite/nfs-server
index 7476204..f749fa8 100755
--- a/testsuite/nfs-server
+++ b/testsuite/nfs-server
@@ -10,14 +10,14 @@ fi
 success() { echo "success: $0: $*" ; }
 error() { echo "error: $0: $*" ; }
 
-# Only Main-Server and Thin-Client-Server should export file systems
+# Only Main-Server and LTSP-Server should export file systems
 # via NFS.
 
 enabled=false
 if echo "$PROFILE" | grep -q Main-Server ; then
     enabled=true
 fi
-if echo "$PROFILE" | grep -q Thin-Client-Server ; then
+if echo "$PROFILE" | grep -q LTSP-Server ; then
     enabled=true
 fi
 
diff --git a/testsuite/ntp b/testsuite/ntp
index 81655ee..b27d389 100755
--- a/testsuite/ntp
+++ b/testsuite/ntp
@@ -7,7 +7,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only networked profiles use NTP
-if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
     :
 else
     exit 0
diff --git a/testsuite/rdp-server b/testsuite/rdp-server
index f65fad4..13b4b1e 100755
--- a/testsuite/rdp-server
+++ b/testsuite/rdp-server
@@ -8,8 +8,8 @@ if test -r /etc/debian-edu/config ; then
     . /etc/debian-edu/config
 fi
 
-# Only Thin-Client-Server profiles provide RDP
-if echo "$PROFILE" | egrep -q 'Thin-Client-Server' ; then
+# Only LTSP-Server profiles provide RDP
+if echo "$PROFILE" | egrep -q 'LTSP-Server' ; then
     :
 else
     exit 0
diff --git a/testsuite/syslog b/testsuite/syslog
index a746793..c9ffb79 100755
--- a/testsuite/syslog
+++ b/testsuite/syslog
@@ -43,13 +43,13 @@ else # not Main-server or Standalone, should forward
     fi
 fi
 
-# Only Main-Server and Thin-Client-Server should accept syslog
+# Only Main-Server and LTSP-Server should accept syslog
 # messages from the net.
 
 if echo "$PROFILE" | grep -q Main-Server ; then
     enabled=true
 fi
-if echo "$PROFILE" | grep -q Thin-Client-Server ; then
+if echo "$PROFILE" | grep -q LTSP-Server ; then
     enabled=true
 fi
 
diff --git a/testsuite/taskpkgs b/testsuite/taskpkgs
index 72cd908..785c425 100755
--- a/testsuite/taskpkgs
+++ b/testsuite/taskpkgs
@@ -73,8 +73,8 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do
 	    check_installed_task education-roaming-workstation
 	    check_desktop_task
 	    ;;
-	Thin-Client-Server|LTSP-server)
-	    check_installed_task education-thin-client-server
+	LTSP-server)
+	    check_installed_task education-ltsp-server
 	    check_desktop_task
 	    ;;
 	Main-Server|Server)
diff --git a/testsuite/webcache b/testsuite/webcache
index 9714424..a30e7e0 100755
--- a/testsuite/webcache
+++ b/testsuite/webcache
@@ -7,7 +7,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only networked profiles use squid
-if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
     :
 else
     exit 0
diff --git a/testsuite/webserver b/testsuite/webserver
index 45bd1f6..78e7311 100755
--- a/testsuite/webserver
+++ b/testsuite/webserver
@@ -9,7 +9,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only networked profiles should have the https certificates
-if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|Thin-Client-Server|Minimal' ; then
+if echo "$PROFILE" | egrep -q 'Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal' ; then
     :
 else
     exit 0
diff --git a/testsuite/workstation b/testsuite/workstation
index 0ba8678..aa4deca 100755
--- a/testsuite/workstation
+++ b/testsuite/workstation
@@ -7,7 +7,7 @@ if test -r /etc/debian-edu/config ; then
 fi
 
 # Only Workstation profiles use squid
-if echo "$PROFILE" | egrep -q 'Workstation|Roaming-Workstation|Thin-Client-Server' ; then
+if echo "$PROFILE" | egrep -q 'Workstation|Roaming-Workstation|LTSP-Server' ; then
     :
 else
     exit 0

-- 
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