3 files changed, 33 insertions, 11 deletions
diff --git a/remote/modules/systemd/module.build b/remote/modules/systemd/module.build
index 4851f682..6e1cf4c1 100644
--- a/remote/modules/systemd/module.build
+++ b/remote/modules/systemd/module.build
@@ -59,11 +59,28 @@ build () {
 	export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib64/pkgconfig:${MODULE_BUILD_DIR}/usr/lib/pkgconfig"
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${MODULE_BUILD_DIR}/usr/lib:${MODULE_BUILD_DIR}/usr/lib64"
 
-	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \
-			--disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \
-			--disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid --enable-acl --enable-pam \
-			--enable-kmod \
+	./configure \
+		--disable-manpages \
+		--enable-split-usr \
+		--sysconfdir="/etc" \
+		--enable-gtk-doc-html=no \
+		--disable-nls \
+		--disable-microhttpd \
+		--disable-bootchart \
+		--disable-quotacheck \
+		--disable-hostnamed \
+		--disable-timedated \
+		--disable-localed \
+		--disable-coredump \
+		--disable-keymap \
+		--without-python \
+		--enable-blkid \
+		--enable-acl \
+		--enable-pam \
+		--enable-kmod \
+		--with-pamlibdir="$SYS_PAM_MODULES_PATH" \
 			|| perror "configure failed."
+
 	pinfo "calling make"
 	make || perror "make failed."
 	pinfo "calling make install"
@@ -82,12 +99,5 @@ post_copy() {
 	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ]; then
 		sed -i "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 	fi
-
-	# 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/module.conf b/remote/modules/systemd/module.conf
index 4ca11365..1bc0165e 100644
--- a/remote/modules/systemd/module.conf
+++ b/remote/modules/systemd/module.conf
@@ -56,6 +56,7 @@ REQUIRED_BINARIES="
 	scsi_id
 	v4l_id"
 REQUIRED_DIRECTORIES="
+	$SYS_PAM_MODULES_PATH
 	/etc
 	/usr/include
 	/usr/share/dbus-1
diff --git a/remote/modules/systemd/module.conf.centos b/remote/modules/systemd/module.conf.centos
new file mode 100644
index 00000000..9232ea5f
--- /dev/null
+++ b/remote/modules/systemd/module.conf.centos
@@ -0,0 +1,11 @@
+REQUIRED_INSTALLED_PACKAGES="
+			intltool
+			gperf
+			libcap-devel
+			libudev-devel
+			dbus-devel
+			libxslt
+			libblkid-devel
+			libacl-devel
+			glib2-devel
+"