kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

bundles/nfs-client: decrease timeout, set some default mount options
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
Franzi 2022-02-20 19:44:05 +01:00
parent dcb563b31e
commit 83fb1a5e11
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/nfs-client/files/nfs.automount
View file

@ -3,7 +3,7 @@ Description=Automount ${mount} on access
[Automount] [Automount]
Where=${mountpoint} Where=${mountpoint}
TimeoutIdleSec=5min TimeoutIdleSec=30
[Install] [Install]
WantedBy=local-fs.target WantedBy=local-fs.target

2
bundles/nfs-client/files/nfs.mount
View file

@ -9,6 +9,8 @@ What=${serverpath}
Where=${mountpoint} Where=${mountpoint}
Type=nfs Type=nfs
Options=${','.join(sorted(mount_options))} Options=${','.join(sorted(mount_options))}
ForceUnmount=yes
TimeoutSec=10
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

6
bundles/nfs-client/items.py
View file

@ -19,6 +19,12 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
if parameter in data: if parameter in data:
directories[data['mountpoint']][parameter] = data[parameter] directories[data['mountpoint']][parameter] = data[parameter]
if 'suid' not in data['mount_options']:
data['mount_options'].add('nosuid')
if 'hard' not in data['mount_options']:
data['mount_options'].add('soft')
if data.get('automount', True): if data.get('automount', True):
data['mount_options'].add('x-systemd.automount') data['mount_options'].add('x-systemd.automount')