From b7aea31ac78c0c5b0752b4e5c455f61c136733f4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 23 Apr 2011 00:07:27 +0200 Subject: adds rootstrap.conf $ARCH support --- bin/pbuilder-user-mode-linux | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bin/pbuilder-user-mode-linux') diff --git a/bin/pbuilder-user-mode-linux b/bin/pbuilder-user-mode-linux index 30800ac..c764738 100755 --- a/bin/pbuilder-user-mode-linux +++ b/bin/pbuilder-user-mode-linux @@ -230,16 +230,14 @@ case "${OPERATION}" in if [ ! -d ~/.pbuilder-user-mode-linux ]; then mkdir ~/.pbuilder-user-mode-linux fi - sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf > ~/.pbuilder-user-mode-linux/rootstrap.conf + sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" /etc/rootstrap/rootstrap.conf | sed "s/arch=.*/arch=${ARCHITECTURE}/" > ~/.pbuilder-user-mode-linux/rootstrap.conf if [ -f rootstrap.conf ]; then - sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" rootstrap.conf > ~/.pbuilder-user-mode-linux/rootstrap.conf - fi - if [ -f rootstrap.conf ]; then - sed "s/arch=.*/arch=${ARCHITECTURE}/" rootstrap.conf > ~/.pbuilder-user-mode-linux/rootstrap.conf + sed "s/dist=.*/dist=${UML_DISTRIBUTION}/" rootstrap.conf | sed "s/arch=.*/arch=${ARCHITECTURE}/" > ~/.pbuilder-user-mode-linux/rootstrap.conf fi cd ~/.pbuilder-user-mode-linux fi rootstrap -s ${ROOTSTRAP_IMAGESIZE:=1000} ${PBUILDER_UML_IMAGE} + echo "DEBUG 1"; sleep 2 operate_uml update ;; *) -- cgit v1.2.3