diff options
| author | Simon Rettberg | 2016-09-06 14:21:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-06 14:21:45 +0200 |
| commit | 1be8f908eabbcfd2e08345d6d4872bbcb3ef4656 (patch) | |
| tree | 8de0559119d6079dd43a6a6afd9a120630b279aa | |
| parent | Merge branch 'master' of git://git.openslx.org/openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-1be8f908eabbcfd2e08345d6d4872bbcb3ef4656.tar.gz tm-scripts-1be8f908eabbcfd2e08345d6d4872bbcb3ef4656.tar.xz tm-scripts-1be8f908eabbcfd2e08345d6d4872bbcb3ef4656.zip | |
[rfs-stage31] Auto login has changed: Set SLX_AUTOLOGIN to enable
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/setup_stage32 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 index 5ec5a69d..070583aa 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 +++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 @@ -58,11 +58,9 @@ if [ $SPLASH -eq 1 ]; then fi fi -# Kinda specific for virtualization environment: Autologin and run VM for benchmarks -if [ -n "$SLX_BENCHMARK_VM" ]; then +# Auto login to demo user requested? +if [ -n "$SLX_AUTOLOGIN" ]; then # Enable KDM autologin for demo user sed -i 's/^AutoLoginUser=.*//;s/^AutoLoginEnable=.*/AutoLoginEnable=true\nAutoLoginUser=demo/' "${FUTURE_ROOT}/etc/kde4/kdm/kdmrc" - # Running the VM automatically has to be taken care of by run-virt and vmchooser. SLX_BENCHMARK_VM should contain - # a numeric value for the index in vmchooser fi |