diff options
| author | Simon Rettberg | 2013-04-02 15:40:13 +0200 |
|---|---|---|
| committer | sr | 2013-04-12 19:11:40 +0200 |
| commit | c7dd67415aa35df157eed529b29eb8de97d860fc (patch) | |
| tree | ba07225bc637b3bb22fbf68a6945efdac84a2ea1 /remote/modules | |
| parent | KERNEL_VERSION from system.inc (diff) | |
| download | tm-scripts-c7dd67415aa35df157eed529b29eb8de97d860fc.tar.gz tm-scripts-c7dd67415aa35df157eed529b29eb8de97d860fc.tar.xz tm-scripts-c7dd67415aa35df157eed529b29eb8de97d860fc.zip | |
Fix kdm and xorg module for openSUSE
Include nouveau driver package for xorg
Include kdm greeter package for kdm
Link kdm config dir to /usr/share for openSUSE (ubuntu expects it at /etc)
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/kdm.build | 6 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.conf.zypper | 2 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.zypper | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build index 9f2008f5..a2602301 100644 --- a/remote/modules/kdm/kdm.build +++ b/remote/modules/kdm/kdm.build @@ -15,8 +15,10 @@ build () { post_copy() { #create static kdm folders in stage3.2 - mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm - mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm + mkdir -p "${TARGET_BUILD_DIR}/var/lib/kdm" + mkdir -p "${TARGET_BUILD_DIR}/var/run/kdm" + # link kdm config as opensuse wants in in another place + ln -s "/etc/kde4" "$TARGET_BUILD_DIR/usr/share/kde4/config" #copy required icons diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper index b0516430..51e73fbf 100644 --- a/remote/modules/kdm/kdm.conf.zypper +++ b/remote/modules/kdm/kdm.conf.zypper @@ -1,5 +1,5 @@ REQUIRED_DEPENDENCIES="kdm" -REQUIRED_PACKAGES="kdm kde-workspace-kgreet-plugins" +REQUIRED_PACKAGES="kdm kde4-kgreeter-plugins" REQUIRED_BINARIES="" REQUIRED_DIRECTORIES=" /etc/dbus-1 /usr/lib/kde4 diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper index ba681c66..85a257ad 100644 --- a/remote/modules/xorg/xorg.conf.zypper +++ b/remote/modules/xorg/xorg.conf.zypper @@ -2,8 +2,12 @@ REQUIRED_PACKAGES=" xorg-x11 xorg-x11-server xorg-x11-driver-input xorg-x11-driver-video + xorg-x11-driver-video-nouveau + xorg-x11-driver-video-radeonhd Mesa - xkeyboard-config" + xkeyboard-config + dejavu + kdm-branding-openSUSE" REQUIRED_BINARIES=" Xorg gtf cvt @@ -18,5 +22,6 @@ REQUIRED_BINARIES=" Xorg vmmouse_detect" REQUIRED_DIRECTORIES=" /lib/udev /usr/lib - /usr/share/X11" -REQUIRED_FILES="" + /usr/share/X11 + /usr/share/fonts" +REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm" |