kernel 5.4.0-73.82-rancher2 (#709)

- leave apparmor disabled by default Addresses #702 Signed-off-by: Jacob Blain Christen <[email protected]>
rancher · Jun 3, 2021 · 4b7fe30 · 4b7fe30
1 parent 12b02eb
commit 4b7fe30
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/images/10-kernel-stage1/Dockerfile b/images/10-kernel-stage1/Dockerfile
@@ -17,8 +17,8 @@ RUN apt-get --assume-yes update \
  && echo 'nls_iso8859_1' >> /etc/initramfs-tools/modules
 
 ARG ARCH
-ENV KVERSION=5.4.0-72-generic
-ENV URL=https://github.com/rancher/k3os-kernel/releases/download/5.4.0-72.80-rancher1
+ENV KVERSION=5.4.0-73-generic
+ENV URL=https://github.com/rancher/k3os-kernel/releases/download/5.4.0-73.82-rancher2
 ENV KERNEL_XZ=${URL}/kernel-generic_${ARCH}.tar.xz
 ENV KERNEL_EXTRA_XZ=${URL}/kernel-extra-generic_${ARCH}.tar.xz
 ENV KERNEL_HEADERS_XZ=${URL}/kernel-headers-generic_${ARCH}.tar.xz

diff --git 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 apparmor=0
+  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=live console=ttyS0 console=tty1
   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 apparmor=0
+  linux (loop0)/vmlinuz printk.devkmsg=on k3os.mode=install console=ttyS0 console=tty1
   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 apparmor=0
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=ttyS0 console=tty1
   initrd /k3os/system/kernel/current/initrd
 }
diff --git 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 apparmor=0 $GRUB_DEBUG
+  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 $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 apparmor=0 $GRUB_DEBUG
+  linux (loop0)/vmlinuz printk.devkmsg=on console=tty1 $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 apparmor=0
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1
   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 apparmor=0
+  linux (loop0)/vmlinuz printk.devkmsg=on rescue console=tty1
   initrd /k3os/system/kernel/previous/initrd
 }
 EOF

diff --git 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} apparmor=0 $*"
+    -append "console=${CONSOLE:=ttyS0} loglevel=${LOGLEVEL:=4} printk.devkmsg=${PRINTK_DEVKMSG:=on} $*"