[debian-edu-commits] debian-edu/ 01/04: Rename thin-client-server profile to ltsp-server-profile. (Closes: #588510)
Holger Levsen
holger at layer-acht.org
Sat Dec 3 13:17:17 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-install.
commit 4ba28b93604710bf8a0fc69f6ca37c681056ce6b
Author: Holger Levsen <holger at layer-acht.org>
Date: Fri Dec 2 14:16:32 2016 +0100
Rename thin-client-server profile to ltsp-server-profile. (Closes: #588510)
Some occurrences of Thin-Client-Server are still left in the code to support
upgrades of systems installed before Stretch.
---
Makefile | 2 +-
README | 2 +-
debian-edu-profile | 28 +++++++++++-----------
debian/changelog | 9 +++++++
debian/debian-edu-install.postinst | 6 ++---
debian/debian-edu-profile-udeb.templates | 14 +++++------
debian/po/templates.pot | 20 ++++++++--------
debian/rules | 2 +-
...lts.thin-client-server => defaults.ltsp-server} | 4 ++--
9 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
index 03e5d93..e6035b2 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ WRITE_ARCH_RECIPE = \
SCRIPTS = $(shell file * */*|egrep 'Bourne|POSIX'|cut -d: -f1)
DEFAULTS = \
- common networked main-server workstation thin-client-server \
+ common networked main-server workstation ltsp-server \
standalone ltsp-chroot
all: check
diff --git a/README b/README
index a628da6..0aa6bf2 100644
--- a/README
+++ b/README
@@ -104,7 +104,7 @@ collected just after installation.
/var 623 642
/var/spool/squid 84 17
- Profile thin-client-server (94edultsp):
+ Profile ltsp-server (94edultsp):
Partition amd64 PXE i386 CD
2013-09-26 2013-07-14
diff --git a/debian-edu-profile b/debian-edu-profile
index de723e8..a256899 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -82,7 +82,7 @@ check_profiles() {
fi
log "Added task '$value'"
;;
- Thin-Client-Server)
+ LTSP-Server)
networked=true
workstation=true
ltspserver=true
@@ -149,7 +149,7 @@ touch $preseedfile
# standalone for laptops. If a main-server is detected select
# workstation for non-laptops, and roaming-workstation for laptops.
# If more than one network interface is detected, preselect
-# Thin-Client-Server for non-laptops.
+# LTSP-Server for non-laptops.
if wget http://tjener/debian-edu-install.dat > /dev/null 2>&1 ; then
log "main-server detected on the network"
if laptop-detect ; then
@@ -166,15 +166,15 @@ else
defaultprofile="Standalone"
laptop=true
else
- defaultprofile="Main-Server, Thin-Client-Server, Workstation"
+ defaultprofile="Main-Server, LTSP-Server, Workstation"
mainserver=true
fi
fi
if [ true != "$mainserver" ] && [ true != "$laptop" ] \
&& [ 1 -lt $(non_wifi_iface_count) ] ; then
- log "several network cards detected, preselecting thin-client-server"
- defaultprofile="$defaultprofile, Thin-Client-Server"
+ log "several network cards detected, preselecting ltsp-server"
+ defaultprofile="$defaultprofile, LTSP-Server"
fi
log "choosing profile"
@@ -239,7 +239,7 @@ done
# Make sure the default values have this priority, with lower number
# priority overriding higher number
# 1 main-server
-# 2 thin-client-server
+# 2 ltsp-server
# 3 workstation
# 4 networked (Common for non-standalone)
# 5 standalone
@@ -257,7 +257,7 @@ if test "$workstation" = true ; then
preseeds="$preseeds workstation"
fi
if test "$ltspserver" = true ; then
- preseeds="$preseeds thin-client-server"
+ preseeds="$preseeds ltsp-server"
fi
if test "$server" = true ; then
preseeds="$preseeds main-server"
@@ -303,12 +303,12 @@ automatic_partitioning() {
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/90edumain
;;
"false-true-true-false-false-false") # single ltspserver
- log "Preseeding partman for Single Thin-Client-Server"
- db_set "partman-auto/choose_recipe" Debian-Edu Thin-Client-Server
+ log "Preseeding partman for Single LTSP-Server"
+ db_set "partman-auto/choose_recipe" Debian-Edu LTSP-Server
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/94edultsp
# Configure the enable-nat script from debian-edu-config to
- # enable NAT on Thin-Client-Servers but not on Combi-Servers
+ # enable NAT on LTSP-Servers but not on Combi-Servers
add_preseed debian-edu-config debian-edu-config/enable-nat boolean true
;;
"false-true-false-false-false-false") # single workstation
@@ -322,8 +322,8 @@ automatic_partitioning() {
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/98edustandalone
;;
"true-false-true-false-false-false") #mainserver & ltspserver
- log "Preseeding partman for Combo Main-server and Thin-Client-Server"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and Thin-Client-Server
+ log "Preseeding partman for Combo Main-server and LTSP-Server"
+ db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and LTSP-Server
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/91edumain+ltsp
# Configure slbackup here in case we have a combo server installation
@@ -335,8 +335,8 @@ automatic_partitioning() {
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/92edumain+ws
;;
"true-true-true-false-false-false") # mainserver & ltspserver & workstation
- log "Preseeding partman for Combo Main-server, Thin-Client-Server, and workstation"
- db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and Thin-Client-Server
+ log "Preseeding partman for Combo Main-server, LTSP-Server, and workstation"
+ db_set "partman-auto/choose_recipe" Debian-Edu Main-Server and LTSP-Server
db_set "partman-auto/expert_recipe_file" /lib/partman/recipes$arch$subarch/91edumain+ltsp
;;
diff --git a/debian/changelog b/debian/changelog
index 153b047..f198e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debian-edu-install (1.908) UNRELEASED; urgency=medium
+
+ * Rename thin-client-server profile to ltsp-server-profile.
+ (Closes: #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 14:15:13 +0100
+
debian-edu-install (1.907) unstable; urgency=medium
[ Holger Levsen ]
diff --git a/debian/debian-edu-install.postinst b/debian/debian-edu-install.postinst
index 3c63c42..90bb439 100644
--- a/debian/debian-edu-install.postinst
+++ b/debian/debian-edu-install.postinst
@@ -67,7 +67,7 @@ if [ ! "$DEBIAN_HAS_FRONTEND" ]; then
workstation=true
roaming=true
;;
- Thin-Client-Server|LTSP-server)
+ LTSP-server|Thin-Client-Server)
networked=true
workstation=true
ltspserver=true
@@ -90,7 +90,7 @@ if [ ! "$DEBIAN_HAS_FRONTEND" ]; then
# Make sure the default values have priority
# 1 main-server
- # 2 thin-client-server
+ # 2 ltsp-server
# 3 workstation
# 4 networked (Common for non-standalone)
# 5 standalone
@@ -105,7 +105,7 @@ if [ ! "$DEBIAN_HAS_FRONTEND" ]; then
load_defaults workstation
fi
if test "$ltspserver" = true ; then
- load_defaults thin-client-server
+ load_defaults ltsp-server
fi
if test "$server" = true ; then
load_defaults main-server
diff --git a/debian/debian-edu-profile-udeb.templates b/debian/debian-edu-profile-udeb.templates
index 0751362..0d25883 100644
--- a/debian/debian-edu-profile-udeb.templates
+++ b/debian/debian-edu-profile-udeb.templates
@@ -5,8 +5,8 @@ _Description: Choose Debian Edu profile
Template: debian-edu-install/profile
Type: multiselect
-__Choices: Main Server, Workstation, Roaming Workstation, Thin Client Server, Standalone, Minimal
-Choices-C: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+__Choices: Main Server, Workstation, Roaming Workstation, LTSP Server, Standalone, Minimal
+Choices-C: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
_Description: Profile(s) to apply to this machine:
Profiles determine how the machine can be used out-of-the-box:
.
@@ -17,7 +17,7 @@ _Description: Profile(s) to apply to this machine:
- Workstation: for normal machines on the Debian Edu network.
- Roaming Workstation: for single user machines on the Debian Edu
network which some times travel outside the network.
- - Thin Client Server:
+ - LTSP Server:
includes 'Workstation' and requires two network
cards.
- Standalone: for machines meant to be used outside the Debian Edu
@@ -93,8 +93,8 @@ Template: debian-edu-install/text/partman-debian-edu-ltsp
Type: text
# Debian Edu ltsp server menu entry for partman recipe.
#flag:translate!:2
-_Description: Debian Edu Thin Client Server
- Prepare partitions for Thin Client Server installation.
+_Description: Debian Edu LTSP Server
+ Prepare partitions for LTSP Server installation.
Template: debian-edu-install/text/partman-debian-edu-workstation
Type: text
@@ -106,9 +106,9 @@ _Description: Debian Edu Workstation
Template: debian-edu-install/text/partman-debian-edu-main+ltsp
Type: text
# Debian Edu combo main+ltsp menu entry for partman recipe.
-_Description: Debian Edu Main Server and Thin Client Server
+_Description: Debian Edu Main Server and LTSP Server
#flag:translate!:2
- Prepare partitions for Main Server and Thin Client Server installation.
+ Prepare partitions for Main Server and LTSP Server installation.
Template: debian-edu-install/text/partman-debian-edu-main+ws
Type: text
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 129683b..aa8c1bf 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -26,42 +26,42 @@ msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
msgid "Main Server"
msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
msgid "Workstation"
msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
msgid "Roaming Workstation"
msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
msgid "Standalone"
msgstr ""
#. Type: multiselect
#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, LTSP-Server, Standalone, Minimal
#: ../debian-edu-profile-udeb.templates:2001
msgid "Minimal"
msgstr ""
@@ -89,7 +89,7 @@ msgid ""
" - Workstation: for normal machines on the Debian Edu network.\n"
" - Roaming Workstation: for single user machines on the Debian Edu\n"
" network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
" includes 'Workstation' and requires two network\n"
" cards.\n"
" - Standalone: for machines meant to be used outside the Debian Edu\n"
@@ -196,7 +196,7 @@ msgstr ""
#. Description
#. Debian Edu ltsp server menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
msgstr ""
#. Type: text
@@ -210,7 +210,7 @@ msgstr ""
#. Description
#. Debian Edu combo main+ltsp menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
msgstr ""
#. Type: text
diff --git a/debian/rules b/debian/rules
index d1ec976..71612cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
DEFAULTS = \
- common networked main-server workstation thin-client-server \
+ common networked main-server workstation ltsp-server \
standalone ltsp-chroot
%:
diff --git a/preseed-values/defaults.thin-client-server b/preseed-values/defaults.ltsp-server
similarity index 89%
rename from preseed-values/defaults.thin-client-server
rename to preseed-values/defaults.ltsp-server
index 50bb71d..cf0257b 100644
--- a/preseed-values/defaults.thin-client-server
+++ b/preseed-values/defaults.ltsp-server
@@ -4,7 +4,7 @@
dhcp3-server dhcp3-server/new_auth_behavior boolean false
# for slbackup (shall just be needed/used when installing a combined
-# main-server+thin-client-server)
+# main-server+ltsp-server)
slbackup slbackup/client_location string /etc /skole/tjener/home0 /opt/ltsp/i386/etc /var/backups
# Set up atftpd to serve the kernels
@@ -22,4 +22,4 @@ d-i ltsp-client-builder/run boolean true
# enable NAT on thin-client-network
debian-edu-config debian-edu-config/enable-nat boolean true
-sitesummary-client sitesummary-client/hostclass string thin-client-server
+sitesummary-client sitesummary-client/hostclass string ltsp-server
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git
More information about the debian-edu-commits
mailing list