From f0adcdd2e8ea8aa224e9d480432dd5ccb05b3b1f Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Thu, 30 Nov 2017 21:37:09 +0100
Subject: [PATCH] Don't call runmirrors with changed home

Actually, setting HOME to the target user is the behavior of the Debian
sudo config anyway.
---
 config/debian-security/cron.unchecked | 2 +-
 config/debian-security/cron.weekly    | 2 +-
 config/debian-security/export.sh      | 2 +-
 config/debian/common                  | 2 +-
 config/debian/dinstall.functions      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 7d576c7d..ec3db1c9 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -117,7 +117,7 @@ if [[ "${old_last_changed}" != "${new_last_changed}" ]]; then
     dak generate-packages-sources2 -a security
     dak generate-releases -a security >/dev/null
     /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh >/dev/null
-    sudo -u archvsync -H runmirrors -a security
+    sudo -u archvsync runmirrors -a security
 fi
 
 cleanup
diff --git a/config/debian-security/cron.weekly b/config/debian-security/cron.weekly
index 8429dda9..6f9102ed 100755
--- a/config/debian-security/cron.weekly
+++ b/config/debian-security/cron.weekly
@@ -37,7 +37,7 @@ cleanup
 trap - EXIT
 
 /srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh >/dev/null
-sudo -u archvsync -H runmirrors -a security
+sudo -u archvsync runmirrors -a security
 
 ${scriptsdir}/link_morgue.sh
 
diff --git a/config/debian-security/export.sh b/config/debian-security/export.sh
index f92ea5b8..6dfcb026 100755
--- a/config/debian-security/export.sh
+++ b/config/debian-security/export.sh
@@ -23,7 +23,7 @@ function changelogs() {
     mkdir -p ${exportpublic}/changelogs
     cd ${exportpublic}/changelogs
     rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
-    sudo -H -u archvsync runmirrors -a metasdo > ~dak/runmirrors-metadata.log 2>&1 &
+    sudo -u archvsync runmirrors -a metasdo > ~dak/runmirrors-metadata.log 2>&1 &
 }
 
 changelogs
diff --git a/config/debian/common b/config/debian/common
index 325892bd..bbb6e22c 100755
--- a/config/debian/common
+++ b/config/debian/common
@@ -108,7 +108,7 @@ function make_buildd_dir () {
 
     # Tell the mirrors that we've updated
     log "Pushing static for incoming.d.o"
-    sudo -H -u archvsync runmirrors -a buildd > ~dak/runmirrors-buildd.log 2>&1 &
+    sudo -u archvsync runmirrors -a buildd > ~dak/runmirrors-buildd.log 2>&1 &
     chronic timeout -k 600 480 /usr/local/bin/static-update-component incoming.debian.org < /dev/null
     wait
 }
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 02d9aefa..2d437fa1 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -582,7 +582,7 @@ function mirrorpush() {
             date -u > ${webdir}/${fname}
             echo "Using dak v1" >> ${webdir}/${fname}
             echo "Running on host $(hostname -f)" >> ${webdir}/${fname}
-            sudo -H -u archvsync runmirrors -a ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
+            sudo -u archvsync runmirrors -a ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
         fi
     done
 }
@@ -594,7 +594,7 @@ function mirrorpush-backports() {
 
 function mirrorpush-release() {
     log "Pushing cdbuilder host"
-    sudo -H -u archvsync runmirrors -a release > ~dak/runmirrors-release.log 2>&1 &
+    sudo -u archvsync runmirrors -a release > ~dak/runmirrors-release.log 2>&1 &
 }
 
 function i18n2() {
-- 
GitLab