From f123fea698bb5db6a57c68a910d6611d75469d4c Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 7 Jul 2013 18:15:13 +0400 Subject: [PATCH] dev: employ control feature ...instead of setting up pam_mktemp ourselves even if that was no big deal too. --- features.in/dev/config.mk | 3 ++- features.in/dev/live/image-scripts.d/40-hasher | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features.in/dev/config.mk b/features.in/dev/config.mk index 1a1b7578..3c189c78 100644 --- a/features.in/dev/config.mk +++ b/features.in/dev/config.mk @@ -1,6 +1,7 @@ -use/dev: +use/dev: use/control @$(call add_feature) @$(call add,THE_PACKAGES,git-core hasher gear) + @$(call add,CONTROL,pam_mktemp:enabled) use/dev/mkimage: use/dev @$(call add,THE_PACKAGES,mkimage shadow-change su) diff --git a/features.in/dev/live/image-scripts.d/40-hasher b/features.in/dev/live/image-scripts.d/40-hasher index c611edaa..7a4d9d91 100755 --- a/features.in/dev/live/image-scripts.d/40-hasher +++ b/features.in/dev/live/image-scripts.d/40-hasher @@ -28,7 +28,6 @@ fi # $TMP TMP="/tmp/.private/$USER" -control pam_mktemp enabled sed -i '/^%_tmppath.*tmp$/d' "$HOME/.rpmmacros" echo "%_tmppath $TMP" >> "$HOME/.rpmmacros"