rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-04 08:14:21 +00:00
Code Issues Releases Wiki Activity

scripts/run: minor cleanup

Browse Source
This commit is contained in:
Ivan Mikushin
2015-07-28 18:58:25 +05:00
parent 4d3e3140ce
commit 7b957d8fc6
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/run
View File

@@ -16,11 +16,11 @@ HD_GZ=${ARTIFACTS}/empty-hd.img.gz
INITRD_TMP=${BUILD}/$(sha1sum ${INITRD} | awk '{print $1}') INITRD_TMP=${BUILD}/$(sha1sum ${INITRD} | awk '{print $1}')
INITRD_CURRENT=${BUILD}/initrd-current INITRD_CURRENT=${BUILD}/initrd-current
INITRD_TEST=${BUILD}/initrd.test INITRD_TEST=${BUILD}/initrd.test
UNAME=$(uname)
USER_DATA=cloud-init/openstack/latest/user_data USER_DATA=cloud-init/openstack/latest/user_data
# PREREQ: brew install coreutils # PREREQ: brew install coreutils
path() { path() {
local UNAME=$(uname)
if [ "$UNAME" == "Darwin" ]; then greadlink -f "$1" if [ "$UNAME" == "Darwin" ]; then greadlink -f "$1"
elif [ "$UNAME" == "Linux" ]; then readlink -f "$1"; elif [ "$UNAME" == "Linux" ]; then readlink -f "$1";
fi fi
@@ -92,8 +92,6 @@ else
done done
fi fi
UNAME=$(uname)
KERNEL_ARGS="quiet rancher.password=rancher console=ttyS0 ${QEMU_APPEND}" KERNEL_ARGS="quiet rancher.password=rancher console=ttyS0 ${QEMU_APPEND}"
if [ "$UNAME" == "Darwin" ] && [ -x $(which xhyve) ]; then if [ "$UNAME" == "Darwin" ] && [ -x $(which xhyve) ]; then