diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-04-23 00:07:27 +0200 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@ymir.das-netzwerkteam.de> | 2011-04-23 00:07:27 +0200 |
| commit | b7aea31ac78c0c5b0752b4e5c455f61c136733f4 (patch) | |
| tree | 55bf2def043bde120809c342af1e7eee27de399b | |
| parent | e1bc117ed2abd0af72e3f8f187a42294b0c567ed (diff) | |
| download | buildscripts-b7aea31ac78c0c5b0752b4e5c455f61c136733f4.tar.gz buildscripts-b7aea31ac78c0c5b0752b4e5c455f61c136733f4.tar.bz2 buildscripts-b7aea31ac78c0c5b0752b4e5c455f61c136733f4.zip | |
adds rootstrap.conf $ARCH support
| -rwxr-xr-x | bin/pbuilder-user-mode-linux | 8 |
1 files changed, 3 insertions, 5 deletions
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 ;; *) |