diff options
| author | Michael Neves | 2013-06-12 15:57:10 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-06-12 15:57:10 +0200 |
| commit | 4b077a5012594cafd19020f43c586c3c15cc109a (patch) | |
| tree | 887f4c5bd32ff74793649c4255064eafbf6c2434 /remote/modules | |
| parent | [systemd] add configure flag for ACL support (diff) | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-4b077a5012594cafd19020f43c586c3c15cc109a.tar.gz tm-scripts-4b077a5012594cafd19020f43c586c3c15cc109a.tar.xz tm-scripts-4b077a5012594cafd19020f43c586c3c15cc109a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/systemd/systemd.build | 7 | ||||
| -rw-r--r-- | remote/modules/systemd/systemd.conf | 1 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.zypper | 27 |
3 files changed, 28 insertions, 7 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 76f9ce6d..027024cf 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -47,5 +47,12 @@ post_copy() { # add nfs to modules-load list echo "nfs" > "${TARGET_BUILD_DIR}/etc/modules-load.d/nfs.conf" + + # add pam_systemd.so to pam modules directory + if [ -e "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" ]; then + cp "${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" "${TARGET_BUILD_DIR}/lib/security/" + else + pdebug "No such file: ${MODULE_BUILD_DIR}/usr/lib/security/pam_systemd.so" + fi } diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index 7623b58e..1bf44782 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -107,4 +107,3 @@ REQUIRED_DIRECTORIES=" /usr/lib/systemd /usr/lib/tmpfiles.d " -REQUIRED_FILES=" /usr/lib/security/pam_systemd.so" diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper index 33aba5eb..9f7d69e7 100644 --- a/remote/modules/xorg/xorg.conf.zypper +++ b/remote/modules/xorg/xorg.conf.zypper @@ -1,4 +1,5 @@ -REQUIRED_CONTENT_PACKAGES=" xorg-x11 +REQUIRED_CONTENT_PACKAGES=" + xorg-x11 xorg-x11-server xorg-x11-driver-input xorg-x11-driver-video @@ -24,7 +25,18 @@ REQUIRED_CONTENT_PACKAGES=" xorg-x11 xkbcomp dejavu-fonts libxcb-glx0 - kdm-branding-openSUSE" + kdm-branding-openSUSE + Mesa +" +REQUIRED_LIBRARIES=" + libI810XvMC + libxcb-glx + libIntelXvMC + i965_dri + vmwgfx_dri + i915_dri + i965_drv_video +" REQUIRED_BINARIES=" Xorg gtf cvt @@ -36,8 +48,11 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" -REQUIRED_DIRECTORIES=" /usr/lib - /usr/bin - /usr/share/X11 - /usr/share/fonts" +REQUIRED_DIRECTORIES=" + /usr/lib/udev + /usr/lib/xorg + /usr/bin + /usr/share/X11 + /usr/share/fonts +" REQUIRED_FILES="/var/adm/fillup-templates/sysconfig.displaymanager-kdm" |