aboutsummaryrefslogtreecommitdiff
path: root/pbuilder-modules
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-08-08 13:11:05 +0000
committerMattia Rizzolo <mattia@mapreri.org>2015-08-08 13:11:05 +0000
commitf3b72f3dbb0205a30f5ef6dc0ccba4bf610b1903 (patch)
tree5ea12fb665fc9ee6514daa3456585f611f6c14b3 /pbuilder-modules
parent45c4b579b701591777915595124178f27b1fc9ca (diff)
downloadpbuilder-f3b72f3dbb0205a30f5ef6dc0ccba4bf610b1903.tar
pbuilder-f3b72f3dbb0205a30f5ef6dc0ccba4bf610b1903.tar.gz
pbuilder-modules: copy /etc/mailname from the host, instead of writing it after `hostname -f` output
Closes: #637627
Diffstat (limited to 'pbuilder-modules')
-rw-r--r--pbuilder-modules4
1 files changed, 1 insertions, 3 deletions
diff --git a/pbuilder-modules b/pbuilder-modules
index f28b2db..9424ec8 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -451,7 +451,7 @@ EOF
function copy_local_configuration () {
log "I: copying local configuration"
- for a in hosts hostname resolv.conf; do
+ for a in hosts hostname resolv.conf mailname; do
if [ -f "/etc/$a" ]; then
rm -f "$BUILDPLACE/etc/$a"
cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";
@@ -481,8 +481,6 @@ function extractbuildplace () {
log "E: failed to extract $BASETGZ to $BUILDPLACE"
exit 1
fi
- log "I: creating local configuration"
- hostname -f > "$BUILDPLACE/etc/mailname"
fi
copy_local_configuration