aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--THANKS1
-rw-r--r--debian/changelog2
-rwxr-xr-xpbuilder-user-mode-linux4
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bd71ced..bed04f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2003-08-15 Junichi Uekawa <dancer@debian.org>
+ * THANKS: update.
+
+ * pbuilder-user-mode-linux (UML_EXITCODE): check against no --distribution flag.
+ pbuilder-user-mode-linux errored out when no distribution was set.
+ From: Marek Habersack <grendel@debian.org>
+
* pbuilder-user-mode-linux.1: update document to note that
pbuilder-uml shouldn't be ran as root.
diff --git a/THANKS b/THANKS
index 57fa456..2babb8b 100644
--- a/THANKS
+++ b/THANKS
@@ -27,6 +27,7 @@ Michel Dänzer <daenzer@debian.org>
Barak Pearlmutter <bap@cs.unm.edu>
Tommaso Moroni <tommaso.m@tiscalinet.it>
Barak Pearlmutter <bap@cs.unm.edu>
+Marek Habersack <grendel@debian.org>
I thank them all!
diff --git a/debian/changelog b/debian/changelog
index a8a2558..1fa19c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ pbuilder (0.81) UNRELEASED; urgency=low
* Note that pbuilder-user-mode-linux should be ran as a normal user.
/etc/mtab will be written to, if root runs pbuilder-user-mode-linux.
+ * "pbuilder-user-mode-linux create" will run properly when --distribution
+ is unset.
-- Junichi Uekawa <dancer@debian.org> Fri, 15 Aug 2003 07:31:48 +0900
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 461483e..616ab85 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -248,7 +248,9 @@ case "${OPERATION}" in
mkdir ~/.pbuilder-user-mode-linux
fi
cd ~/.pbuilder-user-mode-linux
- sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf > rootstrap.conf
+ if [ -n "${UML_DISTRIBUTION}" ]; then
+ sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf > rootstrap.conf
+ fi
rootstrap -s 1000 ${PBUILDER_UML_IMAGE}
operate_uml update
;;