Merge pull request #700 from chrisperelstein/feature/ol8_support

Add support for oracle linux 8.

Author: AkihiroSuda

examples/README.md

@@ -11,6 +11,7 @@ Distro:
 - [`debian.yaml`](./debian.yaml): ⭐Debian GNU/Linux
 - [`fedora.yaml`](./fedora.yaml): ⭐Fedora
 - [`opensuse.yaml`](./opensuse.yaml): ⭐openSUSE Leap
+- [`oraclelinux.yaml`](./oraclelinux.yaml): Oracle Linux
 - [`rocky.yaml`](./rocky.yaml): Rocky Linux
 - [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without extra YAML lines)
 - [`ubuntu-lts.yaml`](./ubuntu-lts.yaml): Ubuntu LTS (same as `ubuntu.yaml` but pinned to an LTS version)

examples/oraclelinux.yaml

@@ -0,0 +1,18 @@
+# Oracle image licence: https://www.oracle.com/downloads/licenses/oracle-linux-license.html
+# Image source: https://yum.oracle.com/oracle-linux-templates.html
+arch: "x86_64"
+
+images:
+- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u5/x86_64/OL8U5_x86_64-olvm-b113.qcow2"
+  arch: "x86_64"
+  digest: "sha256:550db4100b38825d1778f23f8c457f3fc971d96be1326fb512a5e607032b2a24"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+firmware:
+  legacyBIOS: true
+cpuType:
+  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
+  # https://bugs.launchpad.net/qemu/+bug/1838390
+  x86_64: "Haswell-v4"

pkg/cidata/cidata.TEMPLATE.d/boot/30-install-packages.sh

@@ -10,6 +10,14 @@ update_fuse_conf() {
 	fi
 }
 
+dnf_install() {
+	if grep -q "Oracle Linux Server release 8" /etc/system-release; then
+		dnf install --repo ol8_baseos_latest --repo ol8_codeready_builder "$@"
+	else
+		dnf install "$@"
+	fi
+}
+
 INSTALL_IPTABLES=0
 if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ] || [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
 	INSTALL_IPTABLES=1
@@ -39,26 +47,29 @@ if command -v apt-get >/dev/null 2>&1; then
 		fi
 	fi
 elif command -v dnf >/dev/null 2>&1; then
+	if ! command -v tar >/dev/null 2>&1; then
+		dnf_install -y tar
+	fi
 	if [ "${LIMA_CIDATA_MOUNTS}" -gt 0 ]; then
 		if ! command -v sshfs >/dev/null 2>&1; then
-			if grep -q "release 8" /etc/system-release; then
-				dnf install --enablerepo powertools -y fuse-sshfs
+			if grep -q "release 8" /etc/system-release && grep -qv "^Oracle" /etc/system-release; then
+				dnf_install --enablerepo powertools -y fuse-sshfs
 			else
-				dnf install -y fuse-sshfs
+				dnf_install -y fuse-sshfs
 			fi
 		fi
 	fi
 	if [ "${INSTALL_IPTABLES}" = 1 ]; then
 		if [ ! -e /usr/sbin/iptables ]; then
-			dnf install -y iptables
+			dnf_install -y iptables
 		fi
 	fi
 	if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
 		if ! command -v newuidmap >/dev/null 2>&1; then
-			dnf install -y shadow-utils
+			dnf_install -y shadow-utils
 		fi
 		if ! command -v mount.fuse3 >/dev/null 2>&1; then
-			dnf install -y fuse3
+			dnf_install -y fuse3
 		fi
 		if [ ! -e /usr/bin/fusermount ]; then
 			# Workaround for https://github.com/containerd/stargz-snapshotter/issues/340