Merge branch 'testing'

systemd/esame-mk-homedir.service

 [Unit]
 Description=Esame - Reset Home Dir
-After=esame-get-config.service
+After=esame-get-config-boot.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-TimeoutSec=0
+#TimeoutSec=0
 EnvironmentFile=-/local/esame-machine.conf
 ExecStart=/usr/libexec/labmanager/mk-homedir start
+ExecStop=/usr/libexec/labmanager/mk-homedir stop
+ExecRestart=/usr/libexec/labmanager/mk-homedir restart
 
 [Install]
-WantedBy=esame.target
+WantedBy=esame.target esamekiosk.target

systemd/esame-nfs.service

 [Unit]
 Description=Esame - Mount homes (NFS)
 Before=esame-iptables-rules.service
-After=esame-get-config.service
+After=esame-get-config-boot.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-TimeoutSec=0
+#TimeoutSec=0
 EnvironmentFile=-/local/esame-machine.conf
 ExecStart=/usr/libexec/labmanager/nfs start
-#ExecStop=/usr/libexec/labmanager/nfs stop
-#ExecReload=/usr/libexec/labmanager/nfs restart
+ExecStop=/usr/libexec/labmanager/nfs stop
+ExecReload=/usr/libexec/labmanager/nfs restart
 
 [Install]
-WantedBy=esame.target
+WantedBy=esame.target esamekiosk.target

systemd/esame-usb.service

 [Unit]
 Description=Enable/disable USB ports
-After=esame-get-config.service
+After=esame-get-config-boot.service
 
 [Service]
 Type=oneshot
-TimeoutSec=0
+#TimeoutSec=0
 EnvironmentFile=-/local/esame-machine.conf
 ExecStart=/usr/libexec/labmanager/usb start
 ExecStop=/usr/libexec/labmanager/usb stop
 ExecReload=/usr/libexec/labmanager/usb restart
 
 [Install]
-WantedBy=esame.target
+WantedBy=esame.target esamekiosk.target

systemd/esame-virtualbox.service

@@ -12,4 +12,4 @@ ExecStop=/usr/libexec/labmanager/virtualbox stop
 ExecReload=/usr/libexec/labmanager/virtualbox restart
 
 [Install]
-WantedBy=esame.target
+WantedBy=esame.target esamekiosk.target

systemd/esame.target

-# Esame Target
+#  SPDX-License-Identifier: LGPL-2.1+
 #
+#  This file is part of systemd.
 #
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
 
 [Unit]
-Description=Esame
-#Documentation=man:systemd.special(7)
-Requires=graphical.target
-After=graphical.target
-Conflicts=rescue.service rescue.target
+Description=Esame Target
+Requires=multi-user.target
+Wants=display-manager.service accounts-daemon.service rtkit-daemon.service switcheroo-control.service udisks2.service systemd-update-utmp-runlevel.service
+Conflicts=rescue.service rescue.target graphical.target esamekiosk.target
+After=multi-user.target rescue.service rescue.target display-manager.service
 AllowIsolate=yes

systemd/esamekiosk.target

+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=EsameKiosk Target
+Requires=multi-user.target
+Wants=display-manager.service accounts-daemon.service rtkit-daemon.service switcheroo-control.service udisks2.service systemd-update-utmp-runlevel.service
+Conflicts=rescue.service rescue.target graphical.target esame.target
+After=multi-user.target rescue.service rescue.target display-manager.service
+AllowIsolate=yes

systemd/esamesync-esame.service

+[Unit]
+Description=esamesync esame
+After=network.target
+Before=kdm.service getty.target
+Conflicts=
+
+[Service]
+Environment=RUNLEVEL=3
+#ExecStartPre=-/bin/plymouth quit
+#ExecStart=/etc/init.d/esamesync esame
+User=esamesync
+Group=esamesync
+ExecStart=/usr/local/sbin/esamesync-esame.sh
+TimeoutSec=0
+RemainAfterExit=yes
+Type=oneshot
+SysVStartPriority=99
+
+[Install]
+WantedBy=esame.target

systemd/old/configurator.target

-# Configurator Target
-#
-#
-
-[Unit]
-Description=Configurator
-#Documentation=man:systemd.special(7)
-Requires=graphical.target
-After=graphical.target
-Conflicts=rescue.service rescue.target
-AllowIsolate=yes

systemd/old/esame-sa.target

-# Esame Stand alone Target
-
-[Unit]
-Description=Esame Standalone
-#Documentation=man:systemd.special(7)
-Requires=multi-user.target
-Wants=display-manager.service
-Conflicts=rescue.service rescue.target
-After=multi-user.target rescue.service rescue.target display-manager.service
-AllowIsolate=yes

systemd/old/esame-user-sessions.service

-[Unit]
-Description=Kill regular/exam users sessions
-After=esame-iptables-rules.service esame-get-config.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=-/local/esame-machine.conf
-ExecStart=/opt/labmanager/bin/user-sessions start
-ExecStop=/opt/labmanager/bin/user-sessions stop
-ExecReload=/opt/labmanager/bin/user-sessions restart
-
-[Install]
-WantedBy=esame.target