aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--debian/changelog2
-rwxr-xr-xpbuilder-buildpackage2
-rwxr-xr-xpbuilder-user-mode-linux2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 62875e0..84a0b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-25 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-user-mode-linux: use configured PATH instead of hard-coded PATH.
+
+ * pbuilder-buildpackage: preserve PATH in su,
+ pass -p option. This fixes the problem with env-var preservation.
+
2005-06-20 Junichi Uekawa <dancer@debian.org>
* pbuilderrc: set PATH in the configuration file.
diff --git a/debian/changelog b/debian/changelog
index b1395a8..45a5229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ pbuilder (0.128) UNRELEASED; urgency=low
* Bug fix: "pbuilder: Support for preserving environment PATH", thanks
to Brian Nelson (Closes: #306448).
- -- Junichi Uekawa <dancer@debian.org> Mon, 20 Jun 2005 19:39:28 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sat, 25 Jun 2005 15:27:08 +0900
pbuilder (0.127) unstable; urgency=low
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index eb6a342..2d6a7b2 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -32,7 +32,7 @@ if [ ! -f "$PACKAGENAME" ]; then
fi;
if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
- SUTOUSER="su $BUILDUSERNAME -- "
+ SUTOUSER="su -p $BUILDUSERNAME -- "
DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot"
EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot"
echo "I: using fakeroot in build."
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index ed60584..6d8c1d8 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -106,7 +106,7 @@ chmod a+x ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell
chroot ${UML_CHROOT_MOUNTPOINT} /tmp/chrootshell
#some variables need to be set from outside values, possibly
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH="$PATH"
export TMPDIR=/tmp
unset EXTRAOPT || true
declare -a EXTRAOPT