Do not start the displaymanager if no plugin installed in Scientific

Linux.


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

2 files changed, 8 insertions, 2 deletions

diff --git a/initramfs/distro-specs/scilin/functions-5.3 b/initramfs/distro-specs/scilin/functions-5.3
index 2952163c..1548ab9a 100644
--- a/initramfs/distro-specs/scilin/functions-5.3
+++ b/initramfs/distro-specs/scilin/functions-5.3
@@ -31,6 +31,9 @@ echo -e "# Run OpenSLX init runlevel script\n/etc/init.d/boot.slx" \
 # switch off SElinux enforcing
 sed -e "1i# Configuration modified by $0 during stage3 bootup." \
     -e "s/SELINUX=.*/SELINUX=permissive/" -i /mnt/etc/selinux/config
+# switch off display manager start via inittab
+sed -e "s/x:5:re.*/# line deleted in stage3, re-enable via desktop plugin/" \
+    -i /mnt/etc/inittab
 # link halt and reboot scripts
 ln -s ../init.d/killall /mnt/etc/rc.d/rc0.d/S00killall
 ln -s ../init.d/halt /mnt/etc/rc.d/rc0.d/S01halt
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
index 8b9143cf..dfeb1d0a 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
@@ -119,8 +119,11 @@ sub _setupCommonDmScript
         ( su -c "rm -rf /tmp/*" - $USER

           echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) &

         . /etc/X11/xdm/Xreset.system' >/mnt/etc/X11/xdm/Xreset

-        chmod a+x /mnt/etc/X11/xdm/Xreset*

-

+        chmod a+x /mnt/etc/X11/xdm/Xreset*
+
+        # enable the inittab entry again (incomplete)
+        # sed -e "s,# line deleted.*,x:5:respawn:/etc/X11/prefdm -nodaemon," \
+        # -i /mnt/etc/inittab 

     End-of-Here

 

     return $script;