kunsi-p14s: let's try a more recent kernel

bundles/zfs/metadata.py

@@ -50,12 +50,6 @@ defaults = {
     },
     'pacman': {
         'packages': {
-            'zfs-linux-lts': {
-                'needed_by': {
-                    'zfs_dataset:',
-                    'zfs_pool:',
-                },
-            },
             'zfs-utils': {
                 'needed_by': {
                     'svc_systemd:zfs-zed',
@@ -129,6 +123,28 @@ if node.has_bundle('telegraf'):
     }
 
 
+@metadata_reactor.provides(
+    'pacman/packages',
+)
+def packages(metadata):
+    if node.metadata.get('pacman/linux-lts', False):
+        pkgname = 'zfs-linux-lts'
+    else:
+        pkgname = 'zfs-linux'
+    return {
+        'pacman': {
+            'packages': {
+                pkgname: {
+                    'needed_by': {
+                        'zfs_dataset:',
+                        'zfs_pool:',
+                    },
+                },
+            },
+        },
+    }
+
+
 @metadata_reactor.provides(
     'systemd-timers/timers/zfs-scrub',
 )

nodes/kunsi-p14s.py

@@ -70,7 +70,6 @@ nodes['kunsi-p14s'] = {
             },
         },
         'pacman': {
-            'linux-lts': True,
             'no_extract': {
                 'etc/sudoers.d/ctdb', # samba junk
             },
@@ -114,25 +113,25 @@ nodes['kunsi-p14s'] = {
             },
         },
         'systemd-boot': {
-            'default': 'arch-lts',
+            'default': 'arch',
             'entries': {
-                'arch-lts': {
-                    'title': 'Arch Linux (LTS kernel)',
-                    'linux': '/vmlinuz-linux-lts',
+                'arch': {
+                    'title': 'Arch Linux',
+                    'linux': '/vmlinuz-linux',
                     'initrd': [
                         '/amd-ucode.img',
-                        '/initramfs-linux-lts.img',
+                        '/initramfs-linux.img',
                     ],
                     'options': {
                         'zfs=zroot/system/root',
                         'rw',
                     },
                 },
-                'arch-lts-fallback': {
-                    'title': 'Arch Linux (LTS kernel, no ucode, fallback initramfs)',
-                    'linux': '/vmlinuz-linux-lts',
+                'arch-fallback': {
+                    'title': 'Arch Linux (no ucode, fallback initramfs)',
+                    'linux': '/vmlinuz-linux',
                     'initrd': [
-                        '/initramfs-linux-lts-fallback.img',
+                        '/initramfs-linux-fallback.img',
                     ],
                     'options': {
                         'zfs=zroot/system/root',