diff options
4 files changed, 18 insertions, 14 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index f4c193d0..b178c247 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -161,19 +161,21 @@ sub setupGDMScript /mnt$configFile fi fi - case "\${desktop_allowshutdown"} in + case "\${desktop_allowshutdown}" in none) ;; root) - sed "s|AllowShutdown.*|AllowShutdown=true|;\ - s|SecureShutdown.*|SecureShutdown=true" -i /mnt$configFile + sed "s|AllowShutdown.*|AllowShutdown=true|;\\ + s|SecureShutdown.*|SecureShutdown=true" \\ + -i /mnt$configFile ;; users) - sed "s|AllowShutdown.*|AllowShutdown=true|;\ - s|SecureShutdown.*|SecureShutdown=false" -i /mnt$configFile + sed "s|AllowShutdown.*|AllowShutdown=true|;\\ + s|SecureShutdown.*|SecureShutdown=false" \\ + -i /mnt$configFile ;; esac - [ "\${desktop_rootlogin}" -ne 0 ] && \ + [ "\${desktop_rootlogin}" -ne 0 ] && \\ sed "s|AllowRoot.*|AllowRoot=true|" -i /mnt$configFile End-of-Here @@ -205,6 +207,7 @@ sub GDMConfigHashForWorkstation 'gui' => { }, 'security' => { + AllowRoot => 'false', AllowRemoteRoot => 'false', DisallowTCP => 'true', SupportAutomount => 'true', diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index 94d1c3e5..ea4a73ef 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -46,9 +46,10 @@ sub setupGDMScript my $repoPath = shift; my $script = $self->SUPER::setupGDMScript($repoPath); + #my $configFile = $self->GDMPathInfo->{config}; $script .= unshiftHereDoc(<<' End-of-Here'); - rllinker xdm 1 1 + rllinker xdm 1 10 sed -i 's/DISPLAYMANAGER=.*/DISPLAYMANAGER="gdm"/' \ /mnt/etc/sysconfig/displaymanager sed -i "s/DEFAULT_WM=.*/DEFAULT_WM=\"$desktop_kind\"/" \ diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 6f5cfc09..8f5afb5d 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -45,17 +45,17 @@ sub setupGDMScript my $script = $self->SUPER::setupGDMScript($repoPath); - my $pathInfo = $self->GDMPathInfo(); - my $configFile = $pathInfo->{config}; + my $configFile = $self->GDMPathInfo->{config}; - $script .= unshiftHereDoc(<<' End-of-Here'); - rllinker gdm 1 1 + $script .= unshiftHereDoc(<<" End-of-Here"); + rllinker gdm 1 10 echo '/usr/sbin/gdm' >/mnt/etc/X11/default-display-manager chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity - chroot /mnt update-alternatives --set x-session-manager \ + chroot /mnt update-alternatives --set x-session-manager \\ /usr/bin/gnome-session testmkd /mnt/var/lib/gdm root:gdm 1770 - sed "/[daemon]/ a\BaseXsession=/etc/gdm/Xsession" -i /mnt$configFile + sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \\ + -i /mnt$configFile End-of-Here return $script; diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index 886dbd1d..1a9787b5 100644 --- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -128,7 +128,7 @@ sub getAttrInfo applies_to_clients => 1, description => unshiftHereDoc(<<' End-of-Here'), allow the system administrator to logon to the graphical - user interface (0 disallow, 1 allow). + user interface (1 allow, 0 disallow). End-of-Here content_descr => '1 means allowed - 0 means forbidden', content_regex => qr{^(0|1)$}, |