From f2cf42e8ec36ee74bfd7abae0e554c458a03973a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 20 Apr 2018 15:10:27 +0200
Subject: [exams/runmode] Properly disable exam mode for runmodes

---
 modules-available/runmode/baseconfig/getconfig.inc.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'modules-available/runmode/baseconfig/getconfig.inc.php')

diff --git a/modules-available/runmode/baseconfig/getconfig.inc.php b/modules-available/runmode/baseconfig/getconfig.inc.php
index 2d622fc7..214a974c 100644
--- a/modules-available/runmode/baseconfig/getconfig.inc.php
+++ b/modules-available/runmode/baseconfig/getconfig.inc.php
@@ -6,21 +6,16 @@ $foofoo = function($machineUuid) {
 	if ($res === false)
 		return;
 	$config = RunMode::getModuleConfig($res['module']);
-	if ($config === false || $config->configHook === false)
+	if ($config === false)
 		return;
 	if (!Module::isAvailable($res['module']))
 		return; // Not really possible because getModuleConfig would have failed but we should make sure
-	call_user_func($config->configHook, $machineUuid, $res['modeid'], $res['modedata']);
+	if ($config->configHook !== false) {
+		call_user_func($config->configHook, $machineUuid, $res['modeid'], $res['modedata']);
+	}
 	if ($config->systemdDefaultTarget !== false) {
 		ConfigHolder::add('SLX_SYSTEMD_TARGET', $config->systemdDefaultTarget, 10000);
 	}
-	// Disable exam mode - not sure if this is generally a good idea; for now, all modes we can think of would
-	// not make sense that way so do this for now
-	if (ConfigHolder::get('SLX_EXAM') !== false) {
-		ConfigHolder::add('SLX_EXAM', '', 100001);
-		ConfigHolder::add('SLX_EXAM_START', '', 100001);
-		ConfigHolder::add('SLX_AUTOLOGIN', '', 100001);
-	}
 };
 
 $foofoo($uuid);
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 628d6acaf7d8ea65d857565eb73ff51ef6ac602b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 27 Apr 2018 15:42:15 +0200
Subject: [runmode] Add module name of current runmode to /opt/openslx/config

---
 modules-available/runmode/baseconfig/getconfig.inc.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules-available/runmode/baseconfig/getconfig.inc.php')

diff --git a/modules-available/runmode/baseconfig/getconfig.inc.php b/modules-available/runmode/baseconfig/getconfig.inc.php
index 214a974c..8ea2b2a6 100644
--- a/modules-available/runmode/baseconfig/getconfig.inc.php
+++ b/modules-available/runmode/baseconfig/getconfig.inc.php
@@ -16,6 +16,7 @@ $foofoo = function($machineUuid) {
 	if ($config->systemdDefaultTarget !== false) {
 		ConfigHolder::add('SLX_SYSTEMD_TARGET', $config->systemdDefaultTarget, 10000);
 	}
+	ConfigHolder::add('SLX_RUNMODE_MODULE', $res['module']);
 };
 
 $foofoo($uuid);
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522