diff options
| author | Dirk von Suchodoletz | 2011-06-21 17:01:51 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-06-21 17:01:51 +0200 |
| commit | a81b2de4eed1660dcfa57eb68a5df6242565bcf2 (patch) | |
| tree | 33be7e207f08baa99b6f31cbd0670d2016b8e22c | |
| parent | Avoid hardware detection for Xorg (better use autoconfiguration since 1.7 ...... (diff) | |
| download | core-a81b2de4eed1660dcfa57eb68a5df6242565bcf2.tar.gz core-a81b2de4eed1660dcfa57eb68a5df6242565bcf2.tar.xz core-a81b2de4eed1660dcfa57eb68a5df6242565bcf2.zip | |
Fixes for SuSE ...
| -rw-r--r-- | src/initramfs/distro-specs/suse/functions-default | 2 | ||||
| -rw-r--r-- | src/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/initramfs/distro-specs/suse/functions-default b/src/initramfs/distro-specs/suse/functions-default index 8cbb04d3..d763db90 100644 --- a/src/initramfs/distro-specs/suse/functions-default +++ b/src/initramfs/distro-specs/suse/functions-default @@ -119,7 +119,7 @@ mount -t proc proc /proc &>/dev/null rc_status -v -r echo -n "Mounting /dev/pts" -mount -t devpts -o mode=0620,gid=5 devpts /dev/pts +grep -qe "^devpts " /proc/mounts || mount -t devpts -o mode=0620,gid=5 devpts /dev/pts rc_status -v -r if [ -d /sys ] ; then while read a b c ; do diff --git a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm index 7a706019..d03df5b2 100644 --- a/src/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm +++ b/src/os-plugins/plugins/xserver/OpenSLX/Distro/Suse.pm @@ -74,8 +74,7 @@ sub setupXserverScript Driver "evdev" EndSection' >/mnt/etc/X11/xorg.conf.d/10-evdev.conf # Xorg hardware is autodetected, so no module information provided - [ -z "${xmodule}" ] && \ - sed "/Section \"Device\"/,/EndSection/d" -i ${xfc} + sed "/Section \"Device\"/,/EndSection/d" -i ${xfc} testmkd /mnt/var/lib/xkb/compiled testmkd /mnt/var/lib/X11 testmkd /mnt/var/lib/xdm/authdir/authfiles 0700 |