summaryrefslogtreecommitdiffstats
path: root/core/modules/safe-mode
diff options
context:
space:
mode:
authorJonathan Bauer2016-12-23 13:12:09 +0100
committerJonathan Bauer2016-12-23 13:12:09 +0100
commit6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch)
treeb1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/modules/safe-mode
parentwrong kernel version variable used (diff)
downloadmltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz
mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz
mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/modules/safe-mode')
-rw-r--r--core/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode9
l---------core/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service1
-rw-r--r--core/modules/safe-mode/data/etc/systemd/system/safe-mode.service7
3 files changed, 17 insertions, 0 deletions
diff --git a/core/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode b/core/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode
new file mode 100644
index 00000000..d4ab5359
--- /dev/null
+++ b/core/modules/safe-mode/data/etc/X11/Xsession.d/00-exam-mode
@@ -0,0 +1,9 @@
+#!/bin/ash Being sourced but hey
+
+. /opt/openslx/config
+
+if [ "x$SLX_EXAM" = "xyes" ]; then
+ # Force usage of vmchooser
+ set -- "$(which vmchooser)"
+fi
+
diff --git a/core/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service b/core/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service
new file mode 120000
index 00000000..c063e1a0
--- /dev/null
+++ b/core/modules/safe-mode/data/etc/systemd/system/basic.target.wants/safe-mode.service
@@ -0,0 +1 @@
+../safe-mode.service \ No newline at end of file
diff --git a/core/modules/safe-mode/data/etc/systemd/system/safe-mode.service b/core/modules/safe-mode/data/etc/systemd/system/safe-mode.service
new file mode 100644
index 00000000..be0809b4
--- /dev/null
+++ b/core/modules/safe-mode/data/etc/systemd/system/safe-mode.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Sets up safe mode (no magic keys, no tty switch, no openbox menu)
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-safe_mode