sbin/diskless-workstation-shell.*: Drop versions for jessie and stretch, add bullseye version.

4 files changed, 5 insertions, 69 deletions

diff --git a/debian/changelog b/debian/changelog
index d1ceedd..807b3c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ itzks-systems (2021.12.16.1) UNRELEASED; urgency=medium
     + Assure removal of itzks-autofs and itzks-cups.
   * debian/templates:
     + Add school short name 'SPG'.
+  * sbin/diskless-workstation-shell.*:
+    + Drop versions for jessie and stretch, add bullseye version.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 17 Dec 2021 22:03:18 +0100
 
diff --git a/sbin/diskless-workstation-shell b/sbin/diskless-workstation-shell
index d775138..45c512f 120000
--- a/sbin/diskless-workstation-shell
+++ b/sbin/diskless-workstation-shell
@@ -1 +1 @@
-diskless-workstation-shell.stretch
\ No newline at end of file
+diskless-workstation-shell.bullseye
\ No newline at end of file
diff --git a/sbin/diskless-workstation-shell.jessie b/sbin/diskless-workstation-shell.bullseye
index cb2bfb0..88149cc 100755
--- a/sbin/diskless-workstation-shell.jessie
+++ b/sbin/diskless-workstation-shell.bullseye
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
+# Copyright (C) 2011-2021 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
 
 # This script is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ set -e
 
 VERSION=0.3
 DLW_SHELL="bash"
-CHROOT="/srv/ltsp/i386.jessie/"
+CHROOT="/srv/ltsp/amd64+bullseye/"
 
 test -e "$CHROOT" || {
     echo "ERROR: Diskless workstation chroot does not exist at $CHROOT."
diff --git a/sbin/diskless-workstation-shell.stretch b/sbin/diskless-workstation-shell.stretch
deleted file mode 100755
index a6e0063..0000000
--- a/sbin/diskless-workstation-shell.stretch
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@it-zukunft-schule.de>
-
-# This script is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-set -e
-
-VERSION=0.3
-DLW_SHELL="bash"
-CHROOT="/srv/ltsp/amd64+stretch/"
-
-test -e "$CHROOT" || {
-    echo "ERROR: Diskless workstation chroot does not exist at $CHROOT."
-    exit -1
-}
-
-[ "x$USER" == "xroot" ] || {
-    echo "ERROR: Diskless workstation management has to be performed as root."
-    exit -2
-}
-
-cat > "$CHROOT/dlw_shell.sh" <<EOF
-#!/bin/bash
-mount -tproc proc /proc &> /dev/null
-mount /dev/pts &> /dev/null
-export HOME=/root
-export LTSP_HANDLE_DAEMONS="false"
-
-# export the proxy server (if any) to the shell.
-export http_proxy=http://webcache.intern:3128
-export https_proxy=http://webcache.intern:3128
-export ftp_proxy=http://webcache.intern:3128
-
-echo 'This shell has been started in your Diskless Workstation chroot environment.'
-echo 'All changes performed here will take effect on your Diskless Workstations'
-echo 'after their next (re)boot. So be careful!!!'
-echo
-echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the"
-echo 'command line...'
-echo
-
-/bin/$DLW_SHELL
-
-umount -l /proc &> /dev/null
-umount -l /dev/pts &> /dev/null
-
-echo
-echo "Diskless Workstation Shell has exited."
-echo
-EOF
-chmod u+x "$CHROOT/dlw_shell.sh"
-chroot "$CHROOT" /dlw_shell.sh