gnomeos: Rename images to "runtime" and "devel"
They're just better names, and this matches what the default artifact splitter is doing now.
This commit is contained in:
parent
5f3b029638
commit
d444ee917d
|
|
@ -76,7 +76,7 @@ if ! test -d ostree; then
|
||||||
fi
|
fi
|
||||||
cd ostree
|
cd ostree
|
||||||
ostree --repo=${OSTREE_REPO} local-clone repo
|
ostree --repo=${OSTREE_REPO} local-clone repo
|
||||||
for branch in base dev; do
|
for branch in runtime devel; do
|
||||||
rev=$(ostree --repo=repo rev-parse ${BRANCH_PREFIX}${branch});
|
rev=$(ostree --repo=repo rev-parse ${BRANCH_PREFIX}${branch});
|
||||||
if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then
|
if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then
|
||||||
ostree --repo=repo checkout ${rev} ${BRANCH_PREFIX}${branch}-${rev}
|
ostree --repo=repo checkout ${rev} ${BRANCH_PREFIX}${branch}-${rev}
|
||||||
|
|
@ -101,7 +101,7 @@ if ! echo $ARGS | grep -q 'root='; then
|
||||||
ARGS="root=/dev/hda $ARGS"
|
ARGS="root=/dev/hda $ARGS"
|
||||||
fi
|
fi
|
||||||
if ! echo $ARGS | grep -q 'ostree='; then
|
if ! echo $ARGS | grep -q 'ostree='; then
|
||||||
ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS"
|
ARGS="ostree=${BRANCH_PREFIX}runtime-current $ARGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -net user -net nic,model=virtio -append "$ARGS"
|
exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -net user -net nic,model=virtio -append "$ARGS"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue