diff options
| author | Dirk von Suchodoletz | 2008-08-08 23:03:29 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-08-08 23:03:29 +0200 |
| commit | cb8c93e797f6664678b5a7fd746d984a3e907067 (patch) | |
| tree | 67bef8fe049d59e458266f54da79e0c67a0e5ba6 | |
| parent | * Moved broken error handling in installationPhase() to (diff) | |
| download | core-cb8c93e797f6664678b5a7fd746d984a3e907067.tar.gz core-cb8c93e797f6664678b5a7fd746d984a3e907067.tar.xz core-cb8c93e797f6664678b5a7fd746d984a3e907067.zip | |
gdm needs a subdirectory with specific permissions to run properly
(extended the testmkd function for chown,mod settings)
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1994 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index a142f5f2..13753cb4 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -396,6 +396,12 @@ echo "fileget via $fileprot from $fileserv/$cfgfile finished" >/tmp/file-done # to recreate directories in union mounts testmkd () { test -d $1 || mkdir -p $1 >/dev/null 2>&1 + for i in "$2" "$3" ; do + echo "$i"|grep -E "^[0-9]{3,4}$" >/dev/null 2>&1 && \ + chmod "$i" $1 >/dev/null 2>&1 + echo "$i"|grep -E ":." >/dev/null 2>&1 && \ + chown "$i" $1 >/dev/null 2>&1 + done } ############################################################################# diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 7df3825c..833102e6 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -47,10 +47,11 @@ sub setupGDMScript $script .= unshiftHereDoc(<<' End-of-Here'); rllinker gdm 1 1 - echo '/usr/sbin/gdm' > /mnt/etc/X11/default-display-manager + 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 \ /usr/bin/gnome-session + testmkd /mnt/var/lib/gdm root:gdm 1770 End-of-Here return $script; diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index 4f17593f..269af04e 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -36,6 +36,7 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then else testmkd /mnt/etc/vmware fi + # write the /etc/vmware/slxvmconfig file # check for the several variables and write the several files: # dhcpd.conf for vmnet* interfaces |