diff options
| author | Manuel Schneider | 2014-07-23 15:56:46 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-23 15:56:46 +0200 |
| commit | b2ca6da5c5fad2aa6bb08557e5599f67e82633d4 (patch) | |
| tree | 06d6c9839a7dfcb6378e2a276de9dae1e5a89de0 /remote/modules/pam/module.build | |
| parent | [pvs2] Config for pvs2 room templates containing room -100 (diff) | |
| parent | [drm] one more nvidia: 10de-0dd8: nvidia Quadro 2000 (diff) | |
| download | tm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.tar.gz tm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.tar.xz tm-scripts-b2ca6da5c5fad2aa6bb08557e5599f67e82633d4.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pam/module.build')
| -rw-r--r-- | remote/modules/pam/module.build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build index 3f0d8861..b678fdd6 100644 --- a/remote/modules/pam/module.build +++ b/remote/modules/pam/module.build @@ -28,12 +28,13 @@ build() { tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}" # build pam-script separatly since we use a source tarball + # HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at - cd "$MODULE_BUILD_DIR" - local PAM_UNIX_LOCATION=$(find . -name pam_unix.so) cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}." - ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed." + ./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed." make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed." + + # openSuse 13.1 has no package nss-pam-ldapd. So, we compile it. if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION" @@ -46,7 +47,7 @@ build() { cd "$MODULE_BUILD_DIR" local NSLCD_PATH=$(which nslcd) fi - [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'" + [[ $REQUIRED_BINARIES = *nslcd* ]] && [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'" # Build nslcd service file mkdir -p "etc/systemd/system" sed "s,%PATH%,$NSLCD_PATH,g" "$MODULE_DIR/templates/nslcd-systemd.service" > "etc/systemd/system/nslcd.service" || perror "Could not fill nslcd.service template" |