aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog2
-rwxr-xr-xpbuilder-user-mode-linux10
-rw-r--r--pbuilder-user-mode-linux.133
4 files changed, 49 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 205defb..a4cab3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-19 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-user-mode-linux.1: document with more details.
+
+ * pbuilder-user-mode-linux (OPERATION): add distribution option.
+
2002-09-18 Junichi Uekawa <dancer@debian.org>
* pbuilder-uml.conf: change configuration file so that it is more generic.
diff --git a/debian/changelog b/debian/changelog
index e1504ba..012ebcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ pbuilder (0.38) unstable; urgency=low
The interface to configure this package may change very easily. Beware.
* create pbuilder-uml package.
- -- Junichi Uekawa <dancer@debian.org> Wed, 18 Sep 2002 21:32:10 +0900
+ -- Junichi Uekawa <dancer@debian.org> Thu, 19 Sep 2002 19:13:35 +0900
pbuilder (0.37) unstable; urgency=low
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index be1c5bd..b3b9530 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -82,7 +82,11 @@ chroot /tmp/ubd1/ /tmp/chrootshell
#some variables need to be set from outside values, possibly
export PATH=/sbin:/bin:/usr/sbin:/usr/bin
export LOGNAME="${LOGNAME}"
-pbuilder "$1" --buildresult "" --buildplace /tmp/ubd1/ --internal-build-uml ${BUILDING_DSC_FILE}
+EXTRAOPT=
+if [ -n "${UML_DISTRIBUTION}" ]; then
+ EXTRAOPT="--distribution ${UML_DISTRIBUTION}"
+fi
+pbuilder "$1" ${EXTRAOPT} --buildresult "" --buildplace /tmp/ubd1/ --internal-build-uml ${BUILDING_DSC_FILE}
EOF
chmod a+x ${INSIDE_PBUILDER}
@@ -129,6 +133,10 @@ while [ -n "$1" ] ; do
UML_MOUNT_TMPFS="$2";
shift; shift;
;;
+ --distribution)
+ UML_DISTRIBUTION="$2";
+ shift; shift;
+ ;;
--)
shift;
break;
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index e47eb06..191ed30 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -38,6 +38,39 @@ Builds the package specified by
.I ".dsc-file"
within the user-mode-linux environment.
+.TP
+.B "login"
+Invokes shell within UML.
+
+.TP
+.BI "--eth0 [" "uml option for eth0" "]"
+Specify this option as parameter to UML.
+
+.TP
+.BI "--uml-ip [" "IP inside UML" "]"
+Specify this to set the IP inside UML.
+
+
+.TP
+.BI "--uml-netmask [" "netmask" "]"
+.TP
+.BI "--uml-network [" "network" "]"
+.TP
+.BI "--uml-broadcast [" "broadcast" "]"
+.TP
+.BI "--uml-gateway [" "gateway" "]"
+.TP
+.BI "--uml-image [" "UML image" "]"
+Specify the UML image to use.
+
+.TP
+.BI "--mount-tmpfs [" "yes" "]"
+Specify whether to mount tmpfs inside UML chroot.
+
+.TP
+.BI "--distribution [" "sid" "]"
+Specify the distribution.
+
.SH "NOTES"
This software is in early stage of development.
Reading the source may help you in case this software doesn't work for you.