summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-12-22 23:12:33 +0100
committerDirk von Suchodoletz2008-12-22 23:12:33 +0100
commit395439bb2c398f5c7c94c06df1141eb77c4ecd43 (patch)
tree010f1a34e82da6324535c8e02a97af08efbd3e5d /os-plugins
parentAdding inclusion of uclib-rootfs as suggested by Michael. It allows to (diff)
downloadcore-395439bb2c398f5c7c94c06df1141eb77c4ecd43.tar.gz
core-395439bb2c398f5c7c94c06df1141eb77c4ecd43.tar.xz
core-395439bb2c398f5c7c94c06df1141eb77c4ecd43.zip
Small fixes for paths to create ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2447 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm3
-rw-r--r--os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm3
-rw-r--r--os-plugins/plugins/xserver/XX_xserver.sh3
3 files changed, 5 insertions, 4 deletions
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
index 8e03fd68..8e00a903 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm
@@ -36,8 +36,9 @@ sub setupXserverScript
my $script = $self->SUPER::setupXserverScript($repoPath);
$script .= unshiftHereDoc(<<' End-of-Here');
- # suse specific extension to stage3 xserver.sh
+ # SuSE specific extension to stage3 xserver.sh
testmkd /mnt/var/X11R6/bin
+ testmkd /mnt/var/lib/xdm/authdir/authfiles 0700
ln -s /usr/bin/Xorg /mnt/var/X11R6/bin/X
rm /mnt/etc/X11/xdm/SuSEconfig.xdm
End-of-Here
diff --git a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
index bf691b67..162a2291 100644
--- a/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/xserver/OpenSLX/Distro/Ubuntu.pm
@@ -34,7 +34,8 @@ sub setupXserverScript
my $script = $self->SUPER::setupXserverScript($repoPath);
$script .= unshiftHereDoc(<<' End-of-Here');
- # ubuntu specific extension to stage3 xserver.sh
+ # Ubuntu specific extension to stage3 xserver.sh
+ testmkd /mnt/var/run/xauth
End-of-Here
return $script;
diff --git a/os-plugins/plugins/xserver/XX_xserver.sh b/os-plugins/plugins/xserver/XX_xserver.sh
index 5b2f3815..80b4cee6 100644
--- a/os-plugins/plugins/xserver/XX_xserver.sh
+++ b/os-plugins/plugins/xserver/XX_xserver.sh
@@ -46,7 +46,7 @@ if [ -e /initramfs/plugin-conf/xserver.conf -a \
sed "s/.*v4 Server Module: //")
# proprietary ATI/NVidia modules listed a different way with hwinfo
[ -z "$xmodule" ] || error "${hcfg_hwsetup}" nonfatal
-
+
######################################################################
# begin proprietary drivers section (xorg.conf part)
######################################################################
@@ -268,7 +268,6 @@ a\ \ InputDevice\ \ "Synaptics TP"\ \ \ \ \ \ "SendCoreEvents"
fi
fi
-
[ $DEBUGLEVEL -gt 0 ] && echo "done with 'xserver' os-plugin ...";
# some configurations produce no proper screen resolution without