From e9854e3ebb490b009b9aefeb6045db1c906a1c2a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20Schr=C3=B6der?= <mls@suse.de>
Date: Fri, 4 Apr 2008 08:18:15 +0000
Subject: [PATCH] - fix order of things, grrr...

---
 build | 94 +++++++++++++++++++++++++++++++------------------------------------
 1 file changed, 44 insertions(+), 50 deletions(-)

diff --git a/build b/build
index b833ba8..a0cef02 100755
--- a/build
+++ b/build
@@ -635,51 +635,6 @@ while test -n "$1"; do
     esac
 done
 
-if [ -z "$RUNNING_IN_XEN" ]; then
-    
-    if [ -n "$VM_IMAGE" ]; then
-	if [ "$VM_IMAGE" = 1 ]; then
-	    VM_IMAGE="$BUILD_ROOT.img"
-	fi
-	if [ ! -f "$VM_IMAGE" ]; then
-	    echo "you need to create a file system on $VM_IMAGE first"
-	    cleanup_and_exit 1
-	fi
-    fi
-
-    if [ -n "$VM_IMAGE" ]; then
-
-	if [ -n "$CLEAN_BUILD" ]; then
-	    echo "Creating filesystem on $VM_IMAGE"
-	    $xen_img_mkfs $VM_IMAGE || become_root_or_fail
-	fi
-
-	mkdir_build_root
-
-	if [ -w /root ]; then
-	    mount -o loop $VM_IMAGE $BUILD_ROOT || cleanup_and_exit 1
-	else
-	    mount $BUILD_ROOT || become_root_or_fail
-	fi
-    else
-	[ -w /root ] || become_root_or_fail
-    fi
-fi
-
-if [ -z "$RPMLIST" ]; then
-    if [ -z "$repos" -a -z "$BUILD_RPMS" ]; then
-	BUILD_RPMS="/media/dvd/suse"
-    fi
-else
-    repos=()
-fi
-
-set_build_arch
-
-if [ -n "$CLEAN_BUILD" ]; then
-    DO_INIT=true
-fi
-
 if test -n "$KILL" ; then
     test -z "$SRCDIR" || usage
     if test -z "$VM_IMAGE" ; then
@@ -700,6 +655,20 @@ if test -n "$KILL" ; then
     exit 0
 fi
 
+if [ -z "$RPMLIST" ]; then
+    if [ -z "$repos" -a -z "$BUILD_RPMS" ]; then
+	BUILD_RPMS="/media/dvd/suse"
+    fi
+else
+    repos=()
+fi
+
+set_build_arch
+
+if [ -n "$CLEAN_BUILD" ]; then
+    DO_INIT=true
+fi
+
 find_spec_files
 
 if test -n "$LIST_STATE" ; then
@@ -722,13 +691,38 @@ if test -n "$LIST_STATE" ; then
     cleanup_and_exit $ERR
 fi
 
-mkdir_build_root
-
-if test -n "$XENSWAP" ; then
-    dd if=/dev/zero of="$XENSWAP" bs=12 count=1 conv=notrunc 2>/dev/null
-    mkswap "$XENSWAP"
+if test -z "$RUNNING_IN_XEN" ; then
+    if test -n "$VM_IMAGE" ; then
+	if test "$VM_IMAGE" = 1 ; then
+	    VM_IMAGE="$BUILD_ROOT.img"
+	fi
+	if test ! -f "$VM_IMAGE" ; then
+	    echo "you need to create a file system on $VM_IMAGE first"
+	    cleanup_and_exit 1
+	fi
+    fi
+    if test -n "$VM_IMAGE" ; then
+	if test -n "$CLEAN_BUILD" ; then
+	    echo "Creating filesystem on $VM_IMAGE"
+	    $xen_img_mkfs $VM_IMAGE || become_root_or_fail
+	fi
+	mkdir_build_root
+	if [ -w /root ]; then
+	    mount -o loop $VM_IMAGE $BUILD_ROOT || cleanup_and_exit 1
+	else
+	    mount $BUILD_ROOT || become_root_or_fail
+	fi
+    else
+	test -w /root || become_root_or_fail
+    fi
+    if test -n "$XENSWAP" ; then
+	dd if=/dev/zero of="$XENSWAP" bs=12 count=1 conv=notrunc 2>/dev/null
+	mkswap "$XENSWAP"
+    fi
 fi
 
+mkdir_build_root
+
 rm -f $BUILD_ROOT/exit
 
 if [ -w /root ]; then
-- 
2.7.4