diff options
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 19 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index 04f05e9c..a2903fc5 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -282,7 +282,6 @@ sub KDMPathInfo my $pathInfo = { config => '/etc/opt/kdm/kdmrc', paths => [ - '/var/adm/kdm', '/var/lib/kdm', ], }; @@ -323,6 +322,22 @@ sub setupKDMScript /mnt$configFile fi fi + case "\${desktop_allowshutdown}" in + none) + sed "s|AllowShutdown.*|AllowShutdown='None'|" \\ + -i /mnt$configFile + ;; + root) + sed "s|AllowShutdown.*|AllowShutdown='Root'|" \\ + -i /mnt$configFile + ;; + users) + sed "s|AllowShutdown.*|AllowShutdown='All'|" \\ + -i /mnt$configFile + ;; + esac + [ "\${desktop_rootlogin}" -ne 0 ] && \\ + sed "s|AllowRootLogin.*|AllowRootLogin=true|" -i /mnt$configFile End-of-Here return $script; @@ -335,6 +350,8 @@ sub KDMConfigHashForWorkstation return { 'X-:0-Core' => { AutoLoginEnable => 'false', + AllowRootLogin => 'false', + AllowShutdown => 'All', }, 'X-*-Greeter' => { GreetString => 'OpenSLX (%h)', diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 8f5afb5d..55f3938e 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -80,7 +80,7 @@ sub setupKDMScript my $script = $self->SUPER::setupKDMScript($repoPath); $script .= unshiftHereDoc(<<' End-of-Here'); - rllinker kdm 1 1 + rllinker kdm 1 10 echo '/usr/bin/kdm' > /mnt/etc/X11/default-display-manager chroot /mnt update-alternatives --set x-window-manager /usr/bin/kwin chroot /mnt update-alternatives --set x-session-manager \ |