mirror of
https://github.com/rancher/os.git
synced 2025-08-29 03:31:25 +00:00
fix arg use conflict: add --cloud-config parameter
This commit is contained in:
parent
c5676987a9
commit
3a5f2bcb9b
35
scripts/run
35
scripts/run
@ -17,7 +17,27 @@ 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
|
||||||
USER_DATA=cloud-init/openstack/latest/user_data
|
USER_DATA=cloud-init/openstack/latest/user_data
|
||||||
CLOUD_CONFIG=$(readlink -f "$1") || :
|
|
||||||
|
while [ "$#" -gt 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
--append)
|
||||||
|
shift 1
|
||||||
|
QEMU_APPEND="${QEMU_APPEND} $1"
|
||||||
|
;;
|
||||||
|
--cloud-config)
|
||||||
|
shift 1
|
||||||
|
CLOUD_CONFIG=$(readlink -f "$1") || :
|
||||||
|
if [ ! -f ${CLOUD_CONFIG} ]; then
|
||||||
|
echo No such file: "'"${CLOUD_CONFIG}"'" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift 1
|
||||||
|
done
|
||||||
|
|
||||||
if [[ ! -e ${KERNEL} || ! -e ${INITRD} ]]; then
|
if [[ ! -e ${KERNEL} || ! -e ${INITRD} ]]; then
|
||||||
echo "Failed to find ${KERNEL} or ${INITRD}" 1>&2
|
echo "Failed to find ${KERNEL} or ${INITRD}" 1>&2
|
||||||
@ -69,19 +89,6 @@ else
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while [ "$#" -gt 0 ]; do
|
|
||||||
case $1 in
|
|
||||||
--append)
|
|
||||||
shift 1
|
|
||||||
QEMU_APPEND="${QEMU_APPEND} $1"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift 1
|
|
||||||
done
|
|
||||||
|
|
||||||
qemu-system-x86_64 -serial stdio \
|
qemu-system-x86_64 -serial stdio \
|
||||||
-kernel ${KERNEL} \
|
-kernel ${KERNEL} \
|
||||||
-initrd ${INITRD_TEST} \
|
-initrd ${INITRD_TEST} \
|
||||||
|
Loading…
Reference in New Issue
Block a user