From 739395f1e133a716eb408bce9064c8a70bce9c94 Mon Sep 17 00:00:00 2001
From: Jacob Blain Christen <dweomer5@gmail.com>
Date: Thu, 6 May 2021 14:41:24 -0700
Subject: [PATCH] k3s/v1.21.0+k3s1 (#695)

* kernel: apparmor=0

Disable apparmor because the containerd+runc that ships with k3s v1.21.x
assumes that /sys/module/apparmor/parameters/enabled=Y means it should
look for apparmor userland which fails because we don't ship apparmor
userland.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>

* k3s: v1.21.0+k3s1

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
---
 images/10-k3s/Dockerfile | 2 +-
 images/70-iso/grub.cfg   | 6 +++---
 install.sh               | 8 ++++----
 scripts/run-qemu         | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/images/10-k3s/Dockerfile b/images/10-k3s/Dockerfile
index 762d1425..1dfe4695 100644
--- a/images/10-k3s/Dockerfile
+++ b/images/10-k3s/Dockerfile
@@ -4,7 +4,7 @@ FROM ${REPO}/k3os-base:${TAG}
 
 ARG ARCH
 ENV ARCH ${ARCH}
-ENV VERSION v1.20.4+k3s1
+ENV VERSION v1.21.0+k3s1
 ADD https://raw.githubusercontent.com/rancher/k3s/${VERSION}/install.sh /output/install.sh
 ENV INSTALL_K3S_VERSION=${VERSION} \
     INSTALL_K3S_SKIP_START=true \
diff --git a/images/70-iso/grub.cfg b/images/70-iso/grub.cfg
index 919e55a9..5c5d05d3 100644
--- a/images/70-iso/grub.cfg
+++ b/images/70-iso/grub.cfg
@@ -11,7 +11,7 @@ menuentry "k3OS LiveCD & Installer" {
   set sqfile=/k3os/system/kernel/current/kernel.squashfs
   loopback loop0 /$sqfile
   set root=($root)
-  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=live console=ttyS0 console=tty1
+  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=live console=ttyS0 console=tty1 apparmor=0
   initrd /k3os/system/kernel/current/initrd
 }
 
@@ -20,7 +20,7 @@ menuentry "k3OS Installer" {
   set sqfile=/k3os/system/kernel/current/kernel.squashfs
   loopback loop0 /$sqfile
   set root=($root)
-  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=install console=ttyS0 console=tty1
+  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=install console=ttyS0 console=tty1 apparmor=0
   initrd /k3os/system/kernel/current/initrd
 }
 
@@ -29,6 +29,6 @@ menuentry "k3OS Rescue Shell" {
   set sqfile=/k3os/system/kernel/current/kernel.squashfs
   loopback loop0 /$sqfile
   set root=($root)
-  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=ttyS0 console=tty1
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=ttyS0 console=tty1 apparmor=0
   initrd /k3os/system/kernel/current/initrd
 }
diff --git a/install.sh b/install.sh
index 2d931ba9..1c358e07 100755
--- a/install.sh
+++ b/install.sh
@@ -170,7 +170,7 @@ menuentry "k3OS Current" {
   set sqfile=/k3os/system/kernel/current/kernel.squashfs
   loopback loop0 /\$sqfile
   set root=(\$root)
-  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 $GRUB_DEBUG
+  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 apparmor=0 $GRUB_DEBUG
   initrd /k3os/system/kernel/current/initrd
 }
 
@@ -179,7 +179,7 @@ menuentry "k3OS Previous" {
   set sqfile=/k3os/system/kernel/previous/kernel.squashfs
   loopback loop0 /\$sqfile
   set root=(\$root)
-  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 $GRUB_DEBUG
+  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 apparmor=0 $GRUB_DEBUG
   initrd /k3os/system/kernel/previous/initrd
 }
 
@@ -188,7 +188,7 @@ menuentry "k3OS Rescue (current)" {
   set sqfile=/k3os/system/kernel/current/kernel.squashfs
   loopback loop0 /\$sqfile
   set root=(\$root)
-  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1 apparmor=0
   initrd /k3os/system/kernel/current/initrd
 }
 
@@ -197,7 +197,7 @@ menuentry "k3OS Rescue (previous)" {
   set sqfile=/k3os/system/kernel/previous/kernel.squashfs
   loopback loop0 /\$sqfile
   set root=(\$root)
-  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1 apparmor=0
   initrd /k3os/system/kernel/previous/initrd
 }
 EOF
diff --git a/scripts/run-qemu b/scripts/run-qemu
index 14e291f0..375a73de 100755
--- a/scripts/run-qemu
+++ b/scripts/run-qemu
@@ -45,4 +45,4 @@ exec $QEMU_SYSTEM \
     -initrd $(dirname $0)/../dist/artifacts/k3os-initrd-$ARCH \
     -drive if=ide,media=cdrom,file=$(dirname $0)/../dist/artifacts/k3os-$ARCH.iso \
     -drive if=virtio,media=disk,file=$STATE_DIR/${DISK_NAME} \
-    -append "console=${CONSOLE:=ttyS0} loglevel=${LOGLEVEL:=4} printk.devkmsg=${PRINTK_DEVKMSG:=on} $*"
+    -append "console=${CONSOLE:=ttyS0} loglevel=${LOGLEVEL:=4} printk.devkmsg=${PRINTK_DEVKMSG:=on} apparmor=0 $*"