bundles/infobeamer-monitor/files/monitor.py

@@ -40,10 +40,7 @@ def mqtt_out(message, level="INFO", device=None):
     key = "infobeamer"
     if device:
         key += f"/{device['id']}"
-        if device["description"]:
-            message = f"[{device['description']}] {message}"
-        else:
-            message = f"[{device['serial']}] {message}"
+        message = f"[{device['description']}] {message}"
 
     client.publish(
         CONFIG["mqtt"]["topic"],

bundles/pacman/files/pacman.conf

@@ -32,9 +32,21 @@ Include = /etc/pacman.d/mirrorlist
 Server = ${node.metadata.get('pacman/repository')}
 Include = /etc/pacman.d/mirrorlist
 % endif
-% if node.metadata.get('pacman/enable_aurto'):
+% if node.metadata.get('pacman/enable_aurto', True):
 
 [aurto]
 Server = https://aurto.kunbox.net/
 SigLevel = Optional TrustAll
 % endif
+% if node.has_bundle('zfs'):
+
+[archzfs]
+Server = http://archzfs.com/archzfs/x86_64
+
+%  if node.metadata.get('pacman/linux-lts', False):
+[zfs-linux-lts]
+%  else:
+[zfs-linux]
+%  endif
+Server = http://kernels.archzfs.com/$repo/
+% endif

bundles/pacman/items.py

@@ -33,7 +33,6 @@ svc_systemd['paccache.timer'] = {
 }
 
 pkg_pacman = {
-    'acpi_call-lts': {},
     'at': {},
     'autoconf': {},
     'automake': {},
@@ -62,7 +61,6 @@ pkg_pacman = {
     'ldns': {},
     'less': {},
     'libtool': {},
-    'linux-lts': {},
     'logrotate': {},
     'lsof': {},
     'm4': {},
@@ -104,6 +102,12 @@ pkg_pacman = {
     'zip': {},
 }
 
+if node.metadata.get('pacman/linux-lts', False):
+    pkg_pacman['linux-lts'] = {}
+    pkg_pacman['acpi_call-lts'] = {}
+else:
+    pkg_pacman['linux'] = {}
+    pkg_pacman['acpi_call'] = {}
 
 for pkg, config in node.metadata.get('pacman/packages', {}).items():
     pkg_pacman[pkg] = config

bundles/pacman/metadata.py

@@ -4,7 +4,6 @@ defaults = {
             'glibc',
             'pacman',
         },
-        'enable_aurto': True,
         'no_extract': {
             'etc/cron.d/0hourly',
             # don't install systemd-homed pam module. It produces a lot of spam in

bundles/zfs/items.py

@@ -2,9 +2,6 @@ from json import dumps
 
 from bundlewrap.metadata import MetadataJSONEncoder
 
-if node.has_bundle('pacman'):
-    assert node.metadata.get('pacman/enable_aurto'), f'{node.name}: bundle:zfs needs aurto for zfs-linux-lts package'
-
 files = {
     '/etc/modprobe.d/zfs.conf': {
         'source': 'zfs-modprobe.conf',

bundles/zfs/metadata.py

@@ -48,12 +48,6 @@ defaults = {
             'etc/sudoers.d/zfs',
         },
         'packages': {
-            'zfs-linux-lts': {
-                'needed_by': {
-                    'zfs_dataset:',
-                    'zfs_pool:',
-                },
-            },
             'zfs-utils': {
                 'needed_by': {
                     'svc_systemd:zfs-zed',
@@ -127,6 +121,27 @@ 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(
     'apt/packages',
 )

nodes/home/nas.py

@@ -177,10 +177,6 @@ nodes['home.nas'] = {
         },
         'samba': {
             'shares': {
-                'TV': {
-                    'path': '/storage/nas/TV',
-                    'force_group': 'nas',
-                },
                 'music': {
                     'path': '/storage/nas/Musik',
                     'force_group': 'nas',

nodes/kunsi-p14s.py

@@ -115,10 +115,10 @@ nodes['kunsi-p14s'] = {
             'entries': {
                 'arch': {
                     'title': 'Arch Linux',
-                    'linux': '/vmlinuz-linux-lts',
+                    'linux': '/vmlinuz-linux',
                     'initrd': [
                         '/amd-ucode.img',
-                        '/initramfs-linux-lts.img',
+                        '/initramfs-linux.img',
                     ],
                     'options': {
                         'net.ifnames=0',
@@ -128,9 +128,9 @@ nodes['kunsi-p14s'] = {
                 },
                 'arch-fallback': {
                     'title': 'Arch Linux (no ucode, fallback initramfs)',
-                    'linux': '/vmlinuz-linux-lts',
+                    'linux': '/vmlinuz-linux',
                     'initrd': [
-                        '/initramfs-linux-lts-fallback.img',
+                        '/initramfs-linux-fallback.img',
                     ],
                     'options': {
                         'net.ifnames=0',