fixup 1244aad: reproducible Debian: vary user's login shell

29 files changed, 58 insertions, 58 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index eef9172f..e37b6136 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -568,7 +568,7 @@ first_build() {
 	local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=1111
-BUILDUSERNAME=pbuilder1
+export BUILDUSERNAME=pbuilder1
 # pbuilder sets HOME to the value of BUILD_HOME…
 BUILD_HOME=/nonexistent/first-build
 export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
@@ -619,7 +619,7 @@ second_build() {
 	esac
 	cat > "$TMPCFG" << EOF
 BUILDUSERID=2222
-BUILDUSERNAME=pbuilder2
+export BUILDUSERNAME=pbuilder2
 # pbuilder sets HOME to the value of BUILD_HOME…
 BUILD_HOME=/nonexistent/second-build
 export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
diff --git a/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
index bc769ef1..0b173672 100755
--- a/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/hosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -17,8 +17,8 @@ export CAPTURE_ENVIRONMENT="I capture the environment"
 echo "I: Changing /bin/sh to bash" >&2
 echo "dash dash/sh boolean false" | debconf-set-selections
 DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-echo "I: Setting $USER's login shell to /bin/bash" >&2
-usermod -s /bin/bash $USER
+echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
+usermod -s /bin/bash $BUILDUSERNAME
 
 # temporarily disable disorderfs as we have problems properly unmounting it
 exit 0