summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-10 10:44:19 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-10 10:44:19 +0200
commit1244aad527268cb115d992e1db327dfe73d54f20 (patch)
treee7f60ff3fe9a1259da723b3366fc81bff9d95750
parent878abc5a79393b042f2d30fba6dde91864e7bcec (diff)
downloadjenkins.debian.net-1244aad527268cb115d992e1db327dfe73d54f20.tar.xz
fixupp 878abc5a: reproducible Debian: vary user's login shell
-rwxr-xr-xhosts/bbx15-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/bpi0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/cb3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/cbxi4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/cbxi4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/cbxi4pro0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/ff2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/ff2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/ff4a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/hb0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/jenkins-test-vm/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/jenkins/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/odu3a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/odxu4-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/odxu4b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/odxu4c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/opi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/opi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build1-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build10-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build2-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build5-amd64/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/profitbricks-build6-i386/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/rpi2b-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/rpi2c-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/wbd0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
-rwxr-xr-xhosts/wbq0-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment4
28 files changed, 56 insertions, 56 deletions
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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# 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 53164831..bc769ef1 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 $BUILDUSERNAME
+echo "I: Setting $USER's login shell to /bin/bash" >&2
+usermod -s /bin/bash $USER
# temporarily disable disorderfs as we have problems properly unmounting it
exit 0