diff options
| author | Christian Rößler | 2016-11-04 15:59:25 +0100 |
|---|---|---|
| committer | Christian Rößler | 2016-11-04 15:59:25 +0100 |
| commit | 13a665d7317615b472a66ce08fe6c0d126cdea39 (patch) | |
| tree | d5fd4b5f9879f97b5032fc99951d6d3aafc7e7df /remote/rootfs/rootfs-stage31/data/inc/setup_stage32 | |
| parent | [run-virt] resolution scripts now detect first connected output device (not o... (diff) | |
| parent | [rfs-stage32] Run update-issue after setup_partitions for proper /tmp display (diff) | |
| download | tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.gz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.tar.xz tm-scripts-13a665d7317615b472a66ce08fe6c0d126cdea39.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs/rootfs-stage31/data/inc/setup_stage32')
| -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 |