From 83d08eb4d3101f73c51f956dce35977ddb8b07c9 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 31 Mar 2009 12:48:58 +0000
Subject: Fixing problems with gdm running on AUFS/UnionFS (/var/lib/gdm).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2773 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSExport/Distro/Ubuntu.pm         | 3 ++-
 installer/OpenSLX/OSSetup/Distro/Base.pm            | 2 ++
 os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm | 6 +++++-
 os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm | 4 +++-
 os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm   | 5 ++++-
 os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 5 ++++-
 os-plugins/plugins/xserver/XX_xserver.sh            | 2 +-
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
index ab20a48a..e78bf295 100644
--- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
+++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm
@@ -43,6 +43,7 @@ sub initDistroInfo
         - /var/log/*
         - /var/lib/xdm
         - /var/cache/man/*
+	- /var/cache/nscd/*
         - /usr/share/vmware/*
         - /usr/share/autostart/trackerd.desktop
         - /usr/share/autostart/knetworkmanager.desktop
@@ -51,7 +52,7 @@ sub initDistroInfo
         - /proc/*
         - /mnt/*
         - /media/*
-        - /lib/klibc/events/*
+	- /lib/udev/devices
         - /initrd*
         - /etc/cron.*/*
         - /boot/initrd*
diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index f33d4825..b511ec9d 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -99,6 +99,8 @@ sub initialize
         - /etc/resolv.conf.*
         - /etc/opt/openslx
         - /etc/exports*
+        - /etc/X11/xorg.c*
+	- /etc/X11/XF86*
         + /etc
         - /dev/*
         + /dev
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
index e8f5b944..c212b3ef 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Debian.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2006..2009 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -36,6 +36,10 @@ sub setupGDMScript
     $script .= unshiftHereDoc(<<'    End-of-Here');
         rllinker gdm 1 1
         echo '/usr/bin/gdm' > /mnt/etc/X11/default-display-manager
+        # gdm does not like AUFS/UnionFS on its var directory
+        rm -rf /mnt/var/lib/gdm
+        mkdir -m 1770 /mnt/var/lib/gdm
+        chown root:gdm /mnt/var/lib/gdm
     End-of-Here
 
     return $script;
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
index 101e1c73..8b9143cf 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Scilin.pm
@@ -55,7 +55,9 @@ sub setupGDMScript
     $script .= unshiftHereDoc(<<'    End-of-Here');
         echo "DISPLAYMANAGER=GNOME" \
             >/mnt/etc/sysconfig/desktop
-        testmkd /mnt/var/gdm root:gdm 1770
+        # gdm does not like AUFS/UnionFS on its var directory
+        mkdir -m 1770 /mnt/var/lib/gdm
+        chown root:gdm /mnt/var/lib/gdm
     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 b5c340f6..9d22b77c 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -58,7 +58,10 @@ sub setupGDMScript
         sed -i "s/DEFAULT_WM=.*/DEFAULT_WM=\"$desktop_kind\"/" \
             /mnt/etc/sysconfig/windowmanager
         #sed "s|XSESSION|/etc/xdm/Xsession|" -i /mnt$configFile
-        testmkd /mnt/var/lib/gdm gdm:gdm 1775
+        # gdm does not like AUFS/UnionFS on its var directory
+        rm -rf /mnt/var/lib/gdm
+        mkdir -m 1770 /mnt/var/lib/gdm
+        chown root:gdm /mnt/var/lib/gdm
         # no use for this configuration info file
         rm /mnt/etc/gdm/gdm_sysconfig.* 2>/dev/null
     End-of-Here
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index 93e20bb9..b65284ed 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -63,7 +63,10 @@ sub setupGDMScript
         chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity
         chroot /mnt update-alternatives --set x-session-manager \
           /usr/bin/gnome-session
-        testmkd /mnt/var/lib/gdm root:gdm 1770
+        # gdm does not like AUFS/UnionFS on its var directory
+        rm -rf /mnt/var/lib/gdm
+        mkdir -m 1770 /mnt/var/lib/gdm
+        chown root:gdm /mnt/var/lib/gdm
         sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \
           -i /mnt$configFile
     End-of-Here
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 40475c08..284d440f 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -170,7 +170,7 @@ EndSection
 Section "Device"
   Identifier   "Generic Video Card"
   Driver       "vesa"
-#  BusID     "PCI:xx" #especially needed for fglrx
+# BusID        "PCI:xx" #especially needed for fglrx
 EndSection
 Section "Monitor"
   Identifier   "Generic Display"
-- 
cgit v1.2.3-55-g7522