diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | pbuilder-uml.conf | 2 | ||||
| -rw-r--r-- | pbuilder-uml.conf.5 | 4 | ||||
| -rwxr-xr-x | pbuilder-user-mode-linux | 21 | ||||
| -rw-r--r-- | pbuilder-user-mode-linux.1 | 6 | ||||
| -rw-r--r-- | pdebuild.1 | 5 |
8 files changed, 61 insertions, 7 deletions
@@ -1,3 +1,20 @@ +2004-06-19 Junichi Uekawa <dancer@debian.org> + + * pbuilder-user-mode-linux: apply patch from + Mike Markley <mike@markley.org> + Bug#252800: pbuilder-uml: hardcodes rootstrap image size argument + (--buildresult): found typo in error message, + It said $d instead of $2. + + * pbuilder-user-mode-linux.1: document. + + * pbuilder-user-mode-linux (uml-login-nocow): add --uml-login-nocow + option for pbuilder login without COW filesystem use. + + * pdebuild.1: add warning on pdebuild/pbuilder options. + specifying --basetgz as pdebuild option does not work. + 255005 + 2004-06-17 Junichi Uekawa <dancer@debian.org> * pbuilder-updatebuildenv: Patch from matt kraai to save @@ -35,6 +35,7 @@ Roland Stigge Daniel Martin <martin@snowplow.org> Artur R. Czechowski Turbo Fredriksson <turbo@debian.org> +Mike Markley <mike@markley.org> I thank them all! diff --git a/debian/changelog b/debian/changelog index cd83108..e759148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +pbuilder (0.107) unstable; urgency=low + + * Document that pdebuild accepts pbuilder options as pdebuild + options but ignores them, in the manual page. (Closes: #255005). + * Feature request, '--uml-login-nocow' : "pbuilder-uml: How about a "muckwith" option, login + without cowdevice", from Paul Hampson (Closes: #251482). + * Feature: Do not hardcodes rootstrap image size argument", + thanks to Mike Markley (Closes: #252800). + * UML: Fix error message when --buildresult specified wrong directory + + -- Junichi Uekawa <dancer@debian.org> Sat, 19 Jun 2004 11:27:10 +0900 + pbuilder (0.106) unstable; urgency=low * Patch from Matt Kraai to allow apt cache to be saved diff --git a/pbuilder-uml.conf b/pbuilder-uml.conf index c40ceb8..e9b7bb4 100644 --- a/pbuilder-uml.conf +++ b/pbuilder-uml.conf @@ -12,6 +12,6 @@ BUILDPLACE="${HOME}/tmp/" UML_MEM=128M UML_HOSTNAME=$(hostname) UML_BUILDRESULT= - +ROOTSTRAP_IMAGESIZE=1000 diff --git a/pbuilder-uml.conf.5 b/pbuilder-uml.conf.5 index fc0c01b..29b4815 100644 --- a/pbuilder-uml.conf.5 +++ b/pbuilder-uml.conf.5 @@ -73,6 +73,10 @@ will be able to return the FQDN. The directory where build result of pbuilder-user-mode-linux is stored. +.TP +.BI "ROOTSTRAP_IMAGESIZE=" "size-in-megabytes" +The size, in MB, of the disk iamge to create. Defaults to 1000. + .SH "NOTES" It is advised to set diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux index 60cf87d..14547b5 100755 --- a/pbuilder-user-mode-linux +++ b/pbuilder-user-mode-linux @@ -150,6 +150,7 @@ OPERATION="$1" UML_EXTRAOPT= UML_DEBUGMODE= UML_EXECUTE_EXTRAOPT= +UML_LOGIN_NOCOW= shift; while [ -n "$1" ] ; do @@ -201,6 +202,10 @@ while [ -n "$1" ] ; do UML_DISTRIBUTION="$2"; shift; shift; ;; + --uml-login-nocow) + UML_LOGIN_NOCOW=yes; + shift; + ;; #things that can be passed through without options --override-config|--binary-arch) UML_EXTRAOPT="${UML_EXTRAOPT} $1" @@ -218,7 +223,7 @@ while [ -n "$1" ] ; do if [ -d "$2" ]; then UML_BUILDRESULT=$(readlink -f "$2") else - echo "E: Directory $d does not exist" >&2 + echo "E: Directory $2 does not exist" >&2 exit 1 fi shift; shift;; @@ -226,7 +231,7 @@ while [ -n "$1" ] ; do if [ -d "$2" ]; then BUILDPLACE=$(readlink -f "$2") else - echo "E: Directory $d does not exist" >&2 + echo "E: Directory $2 does not exist" >&2 exit 1 fi shift; shift;; @@ -267,8 +272,12 @@ case "${OPERATION}" in operate_uml update ;; login) - usecow - EXTRACLEANUP=cleancow + if [ "${UML_LOGIN_NOCOW}" = "yes" ]; then + echo " -> Not using COW filesystem for login session, modifications to this session will persist" + else + usecow + EXTRACLEANUP=cleancow + fi operate_uml login ;; execute) @@ -276,7 +285,7 @@ case "${OPERATION}" in EXTRACLEANUP=cleancow shift; UML_EXECUTE_EXTRAOPT="${UML_EXECUTE_EXTRAOPT} $@" - operate_uml execute + operate_uml execute ;; create) if [ -n "${UML_DISTRIBUTION}" ]; then @@ -289,7 +298,7 @@ case "${OPERATION}" in fi cd ~/.pbuilder-user-mode-linux fi - rootstrap -s 1000 ${PBUILDER_UML_IMAGE} + rootstrap -s ${ROOTSTRAP_IMAGESIZE:=1000} ${PBUILDER_UML_IMAGE} operate_uml update ;; *) diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1 index 17b215e..81d529a 100644 --- a/pbuilder-user-mode-linux.1 +++ b/pbuilder-user-mode-linux.1 @@ -163,6 +163,12 @@ Specify the directory to place the COW file. The user needs to be able to access that directory, and the directory must exist. +.TP +.BI "--uml-login-nocow" +Do not use COW filesystem when using +.B "pbuilder-user-mode-linux login" +so that changes made in the log in session will persist. + \" copied from pbuilder.8 .TP @@ -93,6 +93,11 @@ Configuration file for pbuilder, used in pdebuild, overrides what is written in .B /etc/pbuilderrc +.SH "BUGS" +pdebuid will accept all options that pbuilder accepts as +pdebuild option. +However, unless the option is documented in the manual page, it +may be ignored. .SH "AUTHOR" Initial coding, and main maintenance is done by |