diff options
| -rw-r--r-- | helper/system.inc | 8 | ||||
| -rw-r--r-- | remote/modules/kdm/kdm.conf.zypper | 2 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf.zypper | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/helper/system.inc b/helper/system.inc index 0cfcfbc6..c37368cb 100644 --- a/helper/system.inc +++ b/helper/system.inc @@ -18,3 +18,11 @@ KERNEL_VERSION=$(uname -r) # determine number of CPU cores CPU_CORES=$(cat /proc/cpuinfo | grep processor | wc -l) export MAKEFLAGS="-j$CPU_CORES" + +# Determine if we have lib64 +if [ "$(uname -m)x" = "x86_64x" ]; then + LIB64="lib64" +else + LIB64="lib" +fi + diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper index a2266c52..081865b3 100644 --- a/remote/modules/kdm/kdm.conf.zypper +++ b/remote/modules/kdm/kdm.conf.zypper @@ -2,7 +2,7 @@ REQUIRED_INSTALLED_PACKAGES="kdm" REQUIRED_CONTENT_PACKAGES="kdm kde4-kgreeter-plugins" REQUIRED_BINARIES="" REQUIRED_DIRECTORIES=" /etc/dbus-1 - /usr/lib/kde4 + /usr/$LIB64/kde4 /usr/share/dbus-1 /usr/share/polkit-1 /usr/share/kde4/services diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper index 58f8bb46..2defe1bb 100644 --- a/remote/modules/pam/pam.conf.zypper +++ b/remote/modules/pam/pam.conf.zypper @@ -1,10 +1,10 @@ REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules" REQUIRED_CONTENT_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules nss-mdns" REQUIRED_BINARIES=" mkhomedir_helper" -REQUIRED_DIRECTORIES=" /lib - /usr/lib +REQUIRED_DIRECTORIES=" /$LIB64 + /usr/$LIB64 /etc/security" REQUIRED_SYSTEM_FILES=" /etc/login.defs /etc/securetty - /lib/security" + /$LIB64/security" |