diff options
| author | dancer <dancer> | 2002-10-28 04:02:49 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2002-10-28 04:02:49 +0000 |
| commit | 78b06e69368987a65f00ab0d7c68e279a36a0946 (patch) | |
| tree | ec7200d65407d0795f39cba9dc42acb1e14f4bf8 | |
| parent | a8d651b4d1e763debbf6d53b8cf332d776397e5e (diff) | |
| download | pbuilder-78b06e69368987a65f00ab0d7c68e279a36a0946.tar pbuilder-78b06e69368987a65f00ab0d7c68e279a36a0946.tar.gz | |
+ * pbuilder-checkparams (BASEBUILDPLACE): check for user-mode-linux operation,
+ Reported by ranty@debian.org
+ Bug: #166194
+
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | THANKS | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | pbuilder-checkparams | 4 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 6 |
5 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2002-10-27 Junichi Uekawa <dancer@debian.org> + + * pbuilder-checkparams (BASEBUILDPLACE): check for user-mode-linux operation, + Reported by ranty@debian.org + Bug: #166194 + 2002-10-23 Junichi Uekawa <dancer@debian.org> * pbuilder-buildpackage-funcs: clean up when dsc-file copying into chroot fails. @@ -13,7 +13,7 @@ David Schleef <ds@schleef.org> Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be> Henrique de Moraes Holschuh <hmh@debian.org> David Schmitt <david@schmitt.edv-bus.at> - +ranty@debian.org I thank them all! diff --git a/debian/changelog b/debian/changelog index a9964d9..92995ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pbuilder (0.46) unstable; urgency=low + + * Fix wrong BASEBUILDPLACE in uml-mode. (closes: #166194) + thanks: ranty@debian.org + + -- Junichi Uekawa <dancer@debian.org> Sun, 27 Oct 2002 19:17:32 +0900 + pbuilder (0.45) unstable; urgency=low * hack HOME to the fakerooted user when fakerooting, to hopefully fool diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 2ca336d..b77879d 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -141,7 +141,9 @@ BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"} # the default is to add a PID in the buildplace specified in the config file. BASEBUILDPLACE="$BUILDPLACE" -BUILDPLACE="$BUILDPLACE/$$" +if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then + BUILDPLACE="$BUILDPLACE/$$" +fi if [ -z "${CHROOTEXEC}" ]; then CHROOTEXEC="chroot $BUILDPLACE " fi diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index b3b9530..9a3844b 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -45,7 +45,7 @@ function operate_uml () { #! /bin/bash mount -t proc /proc /proc mount -t tmpfs /tmp /tmp -mkdir /tmp/ubd1 +mkdir -p ${UML_CHROOT_MOUNTPOINT} mount -t ext2 /dev/ubd/1 ${UML_CHROOT_MOUNTPOINT} if [ "${UML_MOUNT_TMPFS}" = "yes" ]; then mount -t tmpfs ${UML_CHROOT_MOUNTPOINT}/tmp ${UML_CHROOT_MOUNTPOINT}/tmp @@ -76,8 +76,8 @@ cat <<SHELL > ${UML_CHROOT_MOUNTPOINT}/tmp/chrootshell /etc/init.d/networking stop /etc/init.d/networking start SHELL -chmod a+x /tmp/ubd1/tmp/chrootshell -chroot /tmp/ubd1/ /tmp/chrootshell +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 |