diff options
| author | Dirk von Suchodoletz | 2008-08-09 21:20:59 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-09 21:20:59 +0200 |
| commit | 7007a64ed99f906b141a224e80f16dd111928870 (patch) | |
| tree | e969aede11d891a332881268a10b198d78d7ab65 /os-plugins | |
| parent | Implementing (hopefully :)) two stage3 options (allowshutdown and (diff) | |
| download | core-7007a64ed99f906b141a224e80f16dd111928870.tar.gz core-7007a64ed99f906b141a224e80f16dd111928870.tar.xz core-7007a64ed99f906b141a224e80f16dd111928870.zip | |
No need for duplication of script code ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2004 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm | 14 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm | 14 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 17 |
3 files changed, 16 insertions, 29 deletions
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index d15336d7..f4c193d0 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -161,6 +161,20 @@ sub setupGDMScript /mnt$configFile fi fi + case "\${desktop_allowshutdown"} in + none) + ;; + root) + 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 + ;; + esac + [ "\${desktop_rootlogin}" -ne 0 ] && \ + sed "s|AllowRoot.*|AllowRoot=true|" -i /mnt$configFile End-of-Here return $script; diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm index 8421ac71..94d1c3e5 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm @@ -54,20 +54,6 @@ sub setupGDMScript sed -i "s/DEFAULT_WM=.*/DEFAULT_WM=\"$desktop_kind\"/" \ /mnt/etc/sysconfig/windowmanager #sed "s|XSESSION|/etc/xdm/Xsession|" -i /mnt$configFile - case ${desktop_allowshutdown} in - none) - ;; - root) - 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 - ;; - esac - [ ${desktop_rootlogin} -ne 0 ] && \ - sed "s|AllowRoot.*|AllowRoot=true|" -i /mnt$configFile End-of-Here return $script; diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 74d53181..6f5cfc09 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -45,7 +45,8 @@ sub setupGDMScript my $script = $self->SUPER::setupGDMScript($repoPath); - my $configFile = $self->GDMPathInfo()->{config}; + my $pathInfo = $self->GDMPathInfo(); + my $configFile = $pathInfo->{config}; $script .= unshiftHereDoc(<<' End-of-Here'); rllinker gdm 1 1 @@ -55,20 +56,6 @@ sub setupGDMScript /usr/bin/gnome-session testmkd /mnt/var/lib/gdm root:gdm 1770 sed "/[daemon]/ a\BaseXsession=/etc/gdm/Xsession" -i /mnt$configFile - case ${desktop_allowshutdown} in - none) - ;; - root) - 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 - ;; - esac - [ ${desktop_rootlogin} -ne 0 ] && \ - sed "s|AllowRoot.*|AllowRoot=true|" -i /mnt$configFile End-of-Here return $script; |