diff options
| author | Simon Rettberg | 2013-06-26 19:06:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-26 19:06:48 +0200 |
| commit | 6e0ec594c23313ccfa7737b20f96af287137d67c (patch) | |
| tree | dee10b6ccc641b984e9e1ab4a4d7149876025594 /remote/modules | |
| parent | [kdm] bwLehrpool Theme (diff) | |
| parent | Library paths changed to reflect openSuse 64bit ($LIB64) (diff) | |
| download | tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.tar.gz tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.tar.xz tm-scripts-6e0ec594c23313ccfa7737b20f96af287137d67c.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/openbox/openbox.build | 18 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf | 6 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf.zypper | 14 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.zypper | 7 |
4 files changed, 37 insertions, 8 deletions
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build index 51c6beec..0cd6aaad 100644 --- a/remote/modules/openbox/openbox.build +++ b/remote/modules/openbox/openbox.build @@ -16,5 +16,21 @@ build() { post_copy() { [ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango" - pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules" + + # little Workaround, as under e.g. 64bit Suse the binary is called + # pango-querymodules-64, not pango-querymodules. + which pango-querymodules 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -eq 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules + else + which pango-querymodules-64 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -eq 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules-64 + else + perror "Could not find either pango-querymodules or pango-querymodules-64!" + fi + fi + $PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules" } diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index e5bd35c6..a3399190 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -30,12 +30,6 @@ REQUIRED_BINARIES=" rpc.gssd rpc.idmapd sslconnect - mount.crypt - umount.crypt - mount.crypt_LUKS - umount.crypt_LUKS - mount.crypto_LUKS - umount.crypto_LUKS ldapsearch " REQUIRED_LIBRARIES=" diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper index 48dc1d52..403cd59f 100644 --- a/remote/modules/pam/pam.conf.zypper +++ b/remote/modules/pam/pam.conf.zypper @@ -7,6 +7,7 @@ REQUIRED_INSTALLED_PACKAGES=" libopenssl-devel openldap2-client nfsidmap + glibc " REQUIRED_CONTENT_PACKAGES=" pam_ldap @@ -17,12 +18,25 @@ REQUIRED_CONTENT_PACKAGES=" nss-mdns openldap2-client nfsidmap + glibc " REQUIRED_BINARIES=" sslconnect ldapsearch mkhomedir_helper " +REQUIRED_LIBRARIES=" + nsswitch + static + umich_ldap + libnfsidmap + libnss_compat + libnss_db + libnss_dns + libnss_files + libnss_nis +" + REQUIRED_DIRECTORIES=" /$LIB64 /usr/$LIB64 diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper index 9f7d69e7..4041f4bd 100644 --- a/remote/modules/xorg/xorg.conf.zypper +++ b/remote/modules/xorg/xorg.conf.zypper @@ -1,3 +1,4 @@ +# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse REQUIRED_CONTENT_PACKAGES=" xorg-x11 xorg-x11-server @@ -27,6 +28,10 @@ REQUIRED_CONTENT_PACKAGES=" libxcb-glx0 kdm-branding-openSUSE Mesa + xkbutils + xkbprint + setxkbmap + xkbevd " REQUIRED_LIBRARIES=" libI810XvMC @@ -50,7 +55,7 @@ REQUIRED_BINARIES=" Xorg vmmouse_detect" REQUIRED_DIRECTORIES=" /usr/lib/udev - /usr/lib/xorg + /usr/$LIB64/xorg /usr/bin /usr/share/X11 /usr/share/fonts |