summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzer0def2019-12-09 23:17:08 +0100
committerzer0def2019-12-09 23:29:23 +0100
commitc80fb5ba69296c33b2e7597c242c7742626bdc0d (patch)
tree065a42b07247b1c05ffa87f33d4cadaef1f731b5
parent1af3cc567d84374d53d1b389e89037c4d2a3bac0 (diff)
downloadaur-c80fb5ba69296c33b2e7597c242c7742626bdc0d.tar.gz
Amend Firecracker instructions with clarification on which file to target.
-rw-r--r--PKGBUILD11
-rw-r--r--kata-runtime.install2
2 files changed, 7 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 90b3f15df74a..eeafee0b083c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,6 +19,7 @@ __default_suffix="-7.1"
#__shim_suffix="-7.1"
#__ksm_throttler_suffix="-7.1"
#__img_suffix="-7.1"
+__img_sha="ba81eb84dd"
#__linux_container_suffix="-7.1"
source=(
@@ -66,14 +67,14 @@ package_kata-ksm-throttler() {
sed -i 's/libexec/lib/' ${pkgdir}/usr/lib/systemd/system/kata-{ksm,vc}-throttler.service
install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-ksm-throttler/kata-ksm-throttler
install -D -m 0755 {${srcdir}/usr/libexec,${pkgdir}/usr/lib}/kata-ksm-throttler/trigger/virtcontainers/vc
- install -d -m 0755 ${pkgdir}/var/lib/vc/{sbs,uuid}
+ install -d -m 0755 ${pkgdir}/var/lib/vc/{firecracker,sbs,uuid}
}
package_kata-containers-image() {
- install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-image_clearlinux_${pkgver}_agent_ba81eb84dd.img
- ln -sf kata-containers-image_clearlinux_${pkgver}_agent_ba81eb84dd.img ${pkgdir}/usr/share/kata-containers/kata-containers.img
- install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-initrd_alpine_${pkgver}_agent_ba81eb84dd.initrd
- ln -sf kata-containers-initrd_alpine_${pkgver}_agent_ba81eb84dd.initrd ${pkgdir}/usr/share/kata-containers/kata-containers-initrd.img
+ install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-image_clearlinux_${pkgver}_agent_${__img_sha}.img
+ ln -sf kata-containers-image_clearlinux_${pkgver}_agent_${__img_sha}.img ${pkgdir}/usr/share/kata-containers/kata-containers.img
+ install -D -m 0664 {${srcdir},${pkgdir}}/usr/share/kata-containers/kata-containers-initrd_alpine_${pkgver}_agent_${__img_sha}.initrd
+ ln -sf kata-containers-initrd_alpine_${pkgver}_agent_${__img_sha}.initrd ${pkgdir}/usr/share/kata-containers/kata-containers-initrd.img
}
package_kata-linux-container() {
diff --git a/kata-runtime.install b/kata-runtime.install
index 707ece5b6aa2..bf29b5a97eae 100644
--- a/kata-runtime.install
+++ b/kata-runtime.install
@@ -32,7 +32,7 @@ $ docker run --runtime=kata --rm busybox date
"""
-- to run Kata with Firecracker, due to Firecracker's limitations, you have to set your Docker storage driver (ref: https://docs.docker.com/storage/storagedriver/select-storage-driver/ ) to 'devicemapper'
+- to run Kata with Firecracker, due to Firecracker's limitations, you have to set your Docker storage driver (ref: https://docs.docker.com/storage/storagedriver/select-storage-driver/ ) to 'devicemapper' in /etc/docker/daemon.json
"""
{
"storage-driver": "devicemapper"