Output kernel command line to a file in the kernel+initrd output case

Trying to find the relevant yaml file was an issue as we now support
`--name` and it might be in a different directory, so although it is
a bit verbose outputing a whole file at least it is more consistent.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-03-20 12:16:34 +00:00
parent b8aff953f0
commit 9208496d82
7 changed files with 24 additions and 20 deletions

View File

@@ -20,13 +20,13 @@ then
PREFIX="moby"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE=$(bin/moby --cmdline ${PREFIX}.yaml)
CMDLINE="$PREFIX-cmdline"
elif [ $# -eq 1 ]
then
PREFIX="$1"
KERNEL="$PREFIX-bzImage"
INITRD="$PREFIX-initrd.img"
CMDLINE=$(bin/moby --cmdline ${PREFIX}.yaml)
CMDLINE="$PREFIX-cmdline"
else
KERNEL=$1
INITRD=$2

View File

@@ -1,6 +1,6 @@
#!/bin/sh
QEMU_IMAGE=mobylinux/qemu:97973fb6721778c639676812ccb8bc3332e0a542@sha256:c08dac641a75fda3232a8ff3250f23d743aeac12aa4db02ec7926a42b79b0e69
QEMU_IMAGE=mobylinux/qemu:75ef01c780850daf78ee45078606eb740a999edf@sha256:ec93951816b57d86f7a90c129a5580e083093e5a92263d0d2be6822daa2162dd
# if not interactive
if [ ! -t 0 -a -z "$1" ]