josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change hard-coded natty to DIST_NAME

Browse source
This commit is contained in:
Dean Troyer 2011-10-21 14:29:30 -05:00
parent e4f030fef1
commit ad57a3a8e8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/build_kvm.sh
View file

@ -49,7 +49,7 @@ IMAGE_FNAME=$DIST_NAME.raw
CONTAINER_NAME=${CONTAINER_NAME:-kvmstack} CONTAINER_NAME=${CONTAINER_NAME:-kvmstack}
# Original version of built image # Original version of built image
BASE_IMAGE=$KVMSTACK_DIR/images/natty.raw BASE_IMAGE=$KVMSTACK_DIR/images/$DIST_NAME.raw
# Copy of base image, which we pre-install with tasty treats # Copy of base image, which we pre-install with tasty treats
BASE_IMAGE_COPY=$IMAGES_DIR/$DIST_NAME.$CONTAINER_NAME.raw.copy BASE_IMAGE_COPY=$IMAGES_DIR/$DIST_NAME.$CONTAINER_NAME.raw.copy
@ -70,8 +70,8 @@ mkdir -p $COPY_DIR
# Create the base image if it does not yet exist # Create the base image if it does not yet exist
if [ ! -e $IMAGES_DIR/$IMAGE_FNAME ]; then if [ ! -e $IMAGES_DIR/$IMAGE_FNAME ]; then
cd $TOOLS_DIR cd $TOOLS_DIR
./make_image.sh -m -r 5000 natty raw ./make_image.sh -m -r 5000 $DIST_NAME raw
mv natty.raw $BASE_IMAGE mv $DIST_NAME.raw $BASE_IMAGE
cd $TOP_DIR cd $TOP_DIR
fi fi
@ -306,7 +306,7 @@ chmod 755 $RUN_SH
RC_LOCAL=$ROOTFS/etc/init.d/local RC_LOCAL=$ROOTFS/etc/init.d/local
cat > $RC_LOCAL <<EOF cat > $RC_LOCAL <<EOF
#!/bin/sh -e #!/bin/sh -e
# Reboot if this is our first run to enable console log on natty :( # Reboot if this is our first run to enable console log on $DIST_NAME :(
if [ ! -e /root/firstlaunch ]; then if [ ! -e /root/firstlaunch ]; then
touch /root/firstlaunch touch /root/firstlaunch
reboot -f reboot -f