From a38b66a7c570a3b5ef87a781dab8495f3a28f1ec Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Wed, 27 Apr 2022 05:39:34 +0200
Subject: [PATCH] bundles/nfs-client: minor fixes

---
 bundles/nfs-client/items.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bundles/nfs-client/items.py b/bundles/nfs-client/items.py
index f800922..1a8d08b 100644
--- a/bundles/nfs-client/items.py
+++ b/bundles/nfs-client/items.py
@@ -10,15 +10,11 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
     unitname = data.get('mountpoint','')[1:].replace('-','\\x2d').replace('/','-')
 
     directories[data['mountpoint']] = {
-        'owner': None,
-        'group': None,
-        'mode': None,
+        'owner': data.get('owner'),
+        'group': data.get('group'),
+        'mode': data.get('mode'),
     }
 
-    for parameter in ['mode', 'owner', 'group']:
-        if parameter in data:
-            directories[data['mountpoint']][parameter] = data[parameter]
-
     if 'suid' not in data['mount_options']:
         data['mount_options'].add('nosuid')
 
@@ -49,6 +45,13 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
             },
         }
     else:
+        files['/etc/systemd/system/{}.automount'.format(unitname)] = {
+            'delete': True,
+            'triggers': {
+                "action:systemd-reload",
+            },
+        }
+
         svc_systemd['{}.mount'.format(unitname)] = {
             'needs': {
                 'file:/etc/systemd/system/{}.mount'.format(unitname),