aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2003-09-05 00:20:12 +0000
committerdancer <dancer>2003-09-05 00:20:12 +0000
commit63661df3676c0accda02bbee8f209594c627a7c6 (patch)
tree6a05a1a4e58cefb288ae484969e89cabdf8fb901
parentad8185260681f3bd63f776aa4ac796b2bb868c77 (diff)
downloadpbuilder-63661df3676c0accda02bbee8f209594c627a7c6.tar
pbuilder-63661df3676c0accda02bbee8f209594c627a7c6.tar.gz
update
-rw-r--r--ChangeLog7
-rw-r--r--pbuilder-uml.conf.54
-rw-r--r--pbuilder-user-mode-linux.14
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 87d050b..9d26206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2003-09-05 Junichi Uekawa <dancer@debian.org>
+
+ * pbuilder-uml.conf.5: document slirp here also.
+
2003-09-04 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-user-mode-linux.1: Document how to use slirp;
+ it was actually easy.
+
* pbuilder-modules: fix typo in file existence checking.
* debian/TODO: how about passing "-o dpkg::Options=--force-confnew" to apt? is now done.
diff --git a/pbuilder-uml.conf.5 b/pbuilder-uml.conf.5
index 9d74400..46c019f 100644
--- a/pbuilder-uml.conf.5
+++ b/pbuilder-uml.conf.5
@@ -13,6 +13,10 @@ program invocation.
Configures ethernet setting used for booting linux.
See how rootstrap boots your system, and copy that.
+Specify
+.B "--eth0=slirp,12345,/usr/bin/slirp-fullbolt"
+to use the slirp connection.
+
.TP
.BI "UML_IP=" "192.168.0.3"
IP address to use for guest OS.
diff --git a/pbuilder-user-mode-linux.1 b/pbuilder-user-mode-linux.1
index 6d4ae8c..3e715af 100644
--- a/pbuilder-user-mode-linux.1
+++ b/pbuilder-user-mode-linux.1
@@ -68,6 +68,10 @@ Specify the UML image to use.
.BI "--eth0 [" "uml option for eth0" "]"
Specify this option as parameter to UML.
+Specify
+.B "--eth0=slirp,12345,/usr/bin/slirp-fullbolt"
+to use the slirp connection.
+
.TP
.BI "--uml-ip [" "IP inside UML" "]"
Specify this to set the IP inside UML.