summaryrefslogtreecommitdiff
path: root/ucf
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2013-05-18 15:11:40 -0700
committerManoj Srivastava <srivasta@golden-gryphon.com>2013-05-18 15:11:40 -0700
commit8844047a55ef22f53d5ac8f002053a4337e6e30c (patch)
tree3e566d5d155717aeb20a76fdc7163e7408506988 /ucf
parent1a0bc0cf1990f7eec6c31fc3ffc3ebe9880a5367 (diff)
[upstream]: Use dpkg-query --control-path instead of hard-coding a path
ucf's use of a hard-coded path for its debconf templates file is incompatible with multiarch, which will create arch subdirectories and store its state there. As a result, debootstrapping a system using a multiarch-enabled dpkg now fails, since rsyslog uses ucf Closes: 615931 Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
Diffstat (limited to 'ucf')
-rwxr-xr-xucf2
1 files changed, 1 insertions, 1 deletions
diff --git a/ucf b/ucf
index 862f2ea..1d9c23d 100755
--- a/ucf
+++ b/ucf
@@ -633,7 +633,7 @@ if [ -e /usr/share/debconf/confmodule ]; then
# not been loaded or the Debconf DB lost or corrupted
# since then, but only if it is OK to use debconf.
if [ "$DEBCONF_OK" = 'YES' ]; then
- db_x_loadtemplatefile /var/lib/dpkg/info/ucf.templates ucf
+ db_x_loadtemplatefile "$(dpkg-query --control-path ucf templates)" ucf
fi
else
echo >&2 "$progname: Not loading confmodule, since we are not running as root."