dev: employ control feature

...instead of setting up pam_mktemp ourselves even if that was no big deal too.

dev: employ control feature
f123fea6 · Michael Shigorin · f059955d · f123fea6 · f123fea6
Commit f123fea6 authored Jul 07, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config.mk features.in/dev/config.mk +2 -1

40-hasher features.in/dev/live/image-scripts.d/40-hasher +0 -1

No files found.
--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
-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)

--- 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"