diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Documentation/pbuilder-doc.xml | 6 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 13 |
4 files changed, 27 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2003-07-27 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux: support --distribution flag for + pbuilder-user-mode-linux + #176095 + 2003-07-26 Junichi Uekawa <dancer@debian.org> * debian/pbuilder.links: Try symlinking /etc/pbuilderrc to /etc/pbuilder/pbuilderrc diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml index bc36170..fd73432 100644 --- a/Documentation/pbuilder-doc.xml +++ b/Documentation/pbuilder-doc.xml @@ -782,9 +782,9 @@ read It should be possible to create chroot images for <command>dchroot</command> with following commands: <screen> -# pbuilder create --distribution potato --no-targz --basetgz /chroot/potato -# pbuilder create --distribution woody --no-targz --basetgz /chroot/woody -# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid +# pbuilder create --distribution potato --no-targz --basetgz /chroot/potato +# pbuilder create --distribution woody --no-targz --basetgz /chroot/woody +# pbuilder create --distribution sid --no-targz --basetgz /chroot/sid </screen> </para> </sect1> diff --git a/debian/changelog b/debian/changelog index e620c46..c7306e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pbuilder (0.78) unstable; urgency=low + + * Support --distribution flag for user-mode-linux, a long-standing missing + feature. + (closes: #176095) + + -- Junichi Uekawa <dancer@debian.org> Sun, 27 Jul 2003 07:34:13 +0900 + pbuilder (0.77) unstable; urgency=low * Improve documentation on hooks slightly, and mention lintian. diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index e2d3d9f..c96eed7 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -101,9 +101,11 @@ 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 TMPDIR=/tmp -EXTRAOPT= +unset EXTRAOPT +declare -a EXTRAOPT if [ -n "${UML_DISTRIBUTION}" ]; then - EXTRAOPT="--distribution ${UML_DISTRIBUTION}" + EXTRAOPT[0]="--distribution" + EXTRAOPT[1]="${UML_DISTRIBUTION}" fi if [ -z "${UML_BUILDRESULT}" ]; then BUILDRESULT= @@ -113,7 +115,7 @@ else mkdir -p ${UML_CHROOT_BUILDRESULTMOUNTDIR} || true mount -t hostfs none "${UML_CHROOT_BUILDRESULTMOUNTDIR}" -o "${UML_BUILDRESULT}" fi -pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${BUILDING_DSC_FILE} +pbuilder "$1" ${UML_EXTRAOPT} \${EXTRAOPT[@]} --buildresult "\${BUILDRESULT}" --buildplace "${UML_CHROOT_MOUNTPOINT}" --internal-build-uml ${BUILDING_DSC_FILE} echo \$? > /proc/exitcode EOF @@ -242,6 +244,11 @@ case "${OPERATION}" in operate_uml execute ;; create) + if [ ! -d ~/.pbuilder-user-mode-linux ]; then + mkdir ~/.pbuilder-user-mode-linux + fi + cd ~/.pbuilder-user-mode-linux + sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf|lv > rootstrap.conf rootstrap -s 1000 ${PBUILDER_UML_IMAGE} operate_uml update ;; |