Implementing (hopefully :)) two stage3 options (allowshutdown and

rootlogin)


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2003 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 47 insertions, 5 deletions

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index da1f0359..d15336d7 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -175,7 +175,6 @@ sub GDMConfigHashForWorkstation
         },
         'daemon' => {
             AutomaticLoginEnable => 'false',
-            BaseXsession => '/etc/X11/Xsession',
             Group => 'gdm',
             User => 'gdm',
         },
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index edd5bd0c..8421ac71 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -53,6 +53,21 @@ sub setupGDMScript
             /mnt/etc/sysconfig/displaymanager
         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 833102e6..74d53181 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -44,6 +44,8 @@ sub setupGDMScript
     my $repoPath = shift;
 
     my $script = $self->SUPER::setupGDMScript($repoPath);
+
+    my $configFile = $self->GDMPathInfo()->{config};
     
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
@@ -52,6 +54,21 @@ sub setupGDMScript
         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
+        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/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index 0fbca922..886dbd1d 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -111,7 +111,7 @@ sub getAttrInfo
             content_descr => 'one of the entries in "supported_themes"',
             default => 'openslx',
         },
-        'desktop::allow-shutdown' => {
+        'desktop::allowshutdown' => {
             applies_to_systems => 1,
             applies_to_clients => 1,
             description => unshiftHereDoc(<<'            End-of-Here'),
@@ -123,7 +123,7 @@ sub getAttrInfo
             content_descr => 'possible entries "none", "root" or "users"',
             default => 'users',
         },
-        'desktop::allow-rootlogin' => {
+        'desktop::rootlogin' => {
             applies_to_systems => 1,
             applies_to_clients => 1,
             description => unshiftHereDoc(<<'            End-of-Here'),
@@ -132,8 +132,19 @@ sub getAttrInfo
             End-of-Here
             content_descr => '1 means allowed - 0 means forbidden',
             content_regex => qr{^(0|1)$},
-            default => 'users',
+            default => '0',
         },
+        # kiosk mode just has the option to logon user nobody
+        #'desktop::auto-login' => {
+        #    applies_to_systems => 1,
+        #    applies_to_clients => 1,
+        #    description => unshiftHereDoc(<<'            End-of-Here'),
+        #        set an arbitrary user which is logged in automatically into
+        #        the graphical user interface (none disables, default).
+        #    End-of-Here
+        #    content_descr => 'none disables - <user> logins in that userid',
+        #    default => 'none',
+        #},
 
         # stage1
         'desktop::gdm' => {
@@ -544,7 +555,7 @@ sub _setupGDM
     $configHash = $self->{distro}->GDMConfigHashForChooser();
     $self->_writeConfigHash($configHash, "$repoPath/gdm/chooser/gdm.conf");
 
-    return;    
+    return;
 }
 
 sub _setupGDMScript