From b0559b2e4ded3015ee3267b39e2f55d5ac90bf01 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Sun, 30 Oct 2011 19:46:54 -0700 Subject: [PATCH] having work_dir in here complicates jenkins --- tools/build_libvirt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build_libvirt.sh b/tools/build_libvirt.sh index 9860760..560e98f 100755 --- a/tools/build_libvirt.sh +++ b/tools/build_libvirt.sh @@ -20,7 +20,7 @@ TOOLS_DIR=$(cd $(dirname "$0") && pwd) TOP_DIR=`cd $TOOLS_DIR/..; pwd` # Where to store files and instances -WORK_DIR=${WORK_DIR:-$TOP_DIR/work} +WORK_DIR=${WORK_DIR:-/opt/kvmstack} # Where to store images IMAGES_DIR=$WORK_DIR/images @@ -272,7 +272,7 @@ EOF # User configuration for the instance chroot $ROOTFS groupadd libvirtd || true chroot $ROOTFS useradd stack -s /bin/bash -d $DEST -G libvirtd -rsync -av --exclude=work $TOP_DIR $ROOTFS/$DEST/devstack +cp -pr $TOPDIR $ROOTFS/$DEST/devstack echo "root:$ROOT_PASSWORD" | chroot $ROOTFS chpasswd echo "stack:pass" | chroot $ROOTFS chpasswd echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers