|
@@ -35,7 +35,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
|
|
|
util-linux-partx util-linux-hwclock util-linux-mountpoint \
|
|
|
util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit"
|
|
|
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
|
|
|
-PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
|
|
|
+PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}"
|
|
|
|
|
|
PACKAGES_DYNAMIC = "^util-linux-lib.*"
|
|
|
|
|
@@ -91,6 +91,8 @@ FILES_util-linux-findfs = "${sbindir}/findfs"
|
|
|
FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
|
|
|
FILES_util-linux-runuser = "${sbindir}/runuser"
|
|
|
FILES_util-linux-prlimit = "${bindir}/prlimit"
|
|
|
+FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l"
|
|
|
+CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l"
|
|
|
|
|
|
FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \
|
|
|
${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \
|
|
@@ -116,9 +118,10 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
|
|
|
RDEPENDS_util-linux-reset += "ncurses"
|
|
|
|
|
|
RDEPENDS_util-linux-runuser += "libpam"
|
|
|
+RDEPENDS_util-linux-su += "libpam"
|
|
|
|
|
|
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk"
|
|
|
-RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
|
|
|
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}"
|
|
|
|
|
|
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit"
|
|
|
|
|
@@ -182,6 +185,12 @@ do_install () {
|
|
|
install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
|
|
|
install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
|
|
|
fi
|
|
|
+ if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then
|
|
|
+ # Required for "su -" aka "su --login" because
|
|
|
+ # otherwise it uses "other", which has "auth pam_deny.so"
|
|
|
+ # and thus prevents the operation.
|
|
|
+ ln -s su ${D}${sysconfdir}/pam.d/su-l
|
|
|
+ fi
|
|
|
}
|
|
|
|
|
|
# reset and nologin causes a conflict with ncurses-native and shadow-native
|