1 files changed, 29 insertions, 20 deletions
diff --git a/bin/itzks-goodbye-user-session b/bin/itzks-goodbye-user-session
index 24e53d8..754ecf4 100755
--- a/bin/itzks-goodbye-user-session
+++ b/bin/itzks-goodbye-user-session
@@ -17,29 +17,38 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# FIXME: Drop for bookworm. Upstreamed as
-# /usr/share/debian-edu-config/tools/goodbye-user-session
-
-if [ $EUID -ge 500 ]; then
-
-	# safety net for well-known browsers
-	pkill -TERM -u "${LOGNAME}" x-www-browser
-	pkill -TERM -u "${LOGNAME}" firefox-esr
-	pkill -TERM -u "${LOGNAME}" firefox
-	pkill -TERM -u "${LOGNAME}" iceweasel
-	pkill -TERM -u "${LOGNAME}" chromium
-	pkill -TERM -u "${LOGNAME}" chrome
-	pkill -TERM -u "${LOGNAME}" konqueror
-	pkill -TERM -u "${LOGNAME}" midori
-	pkill -TERM -u "${LOGNAME}" opera
-	sleep 1
-
-	# dump all other processes the hard way...
-	pkill -KILL -u "${LOGNAME}"
+
+if [ -x /usr/share/debian-edu-config/tools/goodbye-user-session ]; then
+
+	# Use Debian Edu implementation, if we have it already...
+	/usr/share/debian-edu-config/tools/goodbye-user-session ${@}
 
 else
 
-	echo "$(basename $0): System accounts are not allowed to commit suicide."
+	# FIXME: Drop this section for bookworm. Upstreamed as
+	# /usr/share/debian-edu-config/tools/goodbye-user-session
+	if [ $EUID -ge 500 ]; then
+
+		# safety net for well-known browsers
+		pkill -TERM -u "${LOGNAME}" x-www-browser
+		pkill -TERM -u "${LOGNAME}" firefox-esr
+		pkill -TERM -u "${LOGNAME}" firefox
+		pkill -TERM -u "${LOGNAME}" iceweasel
+		pkill -TERM -u "${LOGNAME}" chromium
+		pkill -TERM -u "${LOGNAME}" chrome
+		pkill -TERM -u "${LOGNAME}" konqueror
+		pkill -TERM -u "${LOGNAME}" midori
+		pkill -TERM -u "${LOGNAME}" opera
+		sleep 1
+
+		# dump all other processes the hard way...
+		pkill -KILL -u "${LOGNAME}"
+
+	else
+
+		echo "$(basename $0): System accounts are not allowed to be terminated by this script."
+
+	fi
 
 fi