summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2008-08-20 00:44:35 -0700
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 17:28:25 -0800
commit5ee1402be9da2d2b914c8a1de5935e61cdf6d103 (patch)
treeeea7bea73cd95053379fbb342967f4fa41361e3d /debian
parentd045b57c7d94f08cbe46b0c2515d54986b41f37d (diff)
add a --package option to pam-auth-update, which lowers the debconf priority
of the multiselect question
Diffstat (limited to 'debian')
-rw-r--r--debian/libpam-cracklib.postinst2
-rw-r--r--debian/libpam-runtime.postinst2
-rwxr-xr-xdebian/local/pam-auth-update7
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/libpam-cracklib.postinst b/debian/libpam-cracklib.postinst
index 6c8b85f4..ad174c45 100644
--- a/debian/libpam-cracklib.postinst
+++ b/debian/libpam-cracklib.postinst
@@ -3,7 +3,7 @@
set -e
if dpkg --compare-versions "$2" lt 1.0.1-3; then
- /usr/sbin/pam-auth-config
+ /usr/sbin/pam-auth-config --package
fi
#DEBHELPER#
diff --git a/debian/libpam-runtime.postinst b/debian/libpam-runtime.postinst
index 5efb3f16..a0387edf 100644
--- a/debian/libpam-runtime.postinst
+++ b/debian/libpam-runtime.postinst
@@ -19,7 +19,7 @@ then
done
fi
-pam-auth-update $force
+pam-auth-update --package $force
if [ -n "$force" ]; then
rm -f /etc/pam.d/common-auth.pam-old \
diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update
index d3e68e0c..bac94349 100755
--- a/debian/local/pam-auth-update
+++ b/debian/local/pam-auth-update
@@ -38,6 +38,7 @@ my $confdir = '/etc/pam.d';
my $savedir = '/var/lib/pam';
my (%profiles, @sorted, @enabled, @conflicts);
my $force = 0;
+my $priority = 'high';
opendir(DIR, $inputdir) || die "could not open config directory: $!";
while (my $profile = readdir(DIR)) {
@@ -59,6 +60,8 @@ while ($#ARGV >= 0) {
my $opt = shift;
if ($opt eq '--force') {
$force = 1;
+ } elsif ($opt eq '--package') {
+ $priority = 'medium';
}
}
@@ -127,9 +130,7 @@ do {
}
if (@conflicts) {
subst($errtemplate, 'conflicts', join("\n", @conflicts));
- # FIXME: we don't want this to always be 'high', only when
- # called by the user
- input('high',$errtemplate);
+ input($priority,$errtemplate);
}
fset($template,'seen','false');
set($template, join(', ', @enabled));