bundles/nfs-client: support arch linux
All checks were successful
bundlewrap/pipeline/head This commit looks good

This commit is contained in:
Franzi 2021-03-11 15:23:47 +01:00
parent c87611c2e2
commit f6ecf2a465
Signed by: kunsi
GPG key ID: 12E3D2136B818350
4 changed files with 25 additions and 3 deletions

View file

@ -1,3 +1,8 @@
if node.has_bundle('pacman'):
package = 'pkg_pacman:nfs-utils'
else:
package = 'pkg_apt:nfs-common'
for mount, data in node.metadata.get('nfs-client/mounts',{}).items(): for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
data['mount'] = mount data['mount'] = mount
data['mount_options'] = set(data.get('mount_options', set())) data['mount_options'] = set(data.get('mount_options', set()))
@ -34,7 +39,7 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
'file:/etc/systemd/system/{}.mount'.format(unitname), 'file:/etc/systemd/system/{}.mount'.format(unitname),
'file:/etc/systemd/system/{}.automount'.format(unitname), 'file:/etc/systemd/system/{}.automount'.format(unitname),
'directory:{}'.format(data['mountpoint']), 'directory:{}'.format(data['mountpoint']),
'pkg_apt:nfs-common', package,
}, },
} }
else: else:
@ -42,7 +47,7 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
'needs': { 'needs': {
'file:/etc/systemd/system/{}.mount'.format(unitname), 'file:/etc/systemd/system/{}.mount'.format(unitname),
'directory:{}'.format(data['mountpoint']), 'directory:{}'.format(data['mountpoint']),
'pkg_apt:nfs-common', package,
}, },
} }

View file

@ -4,4 +4,9 @@ defaults = {
'nfs-common': {}, 'nfs-common': {},
}, },
}, },
'pacman': {
'packages': {
'nfs-utils': {},
},
},
} }

View file

@ -150,7 +150,6 @@ nodes['home.router'] = {
'kunsi': { 'kunsi': {
'ssh_pubkey': { 'ssh_pubkey': {
# work laptop # work laptop
'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM68t1Ssf0c9dEkYOEXllUQ0aybPsW3aQAJuWpUHPlt',
'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICYst1HK+gJYhNxzqJGnz4iB73pa89Xz2yH+8wufOcsA', 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICYst1HK+gJYhNxzqJGnz4iB73pa89Xz2yH+8wufOcsA',
}, },
}, },

View file

@ -5,6 +5,7 @@ nodes['kunsi-t470'] = {
'bundles': { 'bundles': {
'basic', 'basic',
'lldp', 'lldp',
'nfs-client',
'pacman', 'pacman',
'openssh', 'openssh',
'sudo', 'sudo',
@ -36,6 +37,18 @@ nodes['kunsi-t470'] = {
'locale': { 'locale': {
'default': 'en_DK.UTF-8', 'default': 'en_DK.UTF-8',
}, },
'nfs-client': {
'mounts': {
'nas-storage': {
'mountpoint': '/mnt/nas',
'serverpath': '172.19.138.20:/storage/nas',
'mount_options': {
'retry=0',
'ro',
},
},
},
},
'pacman': { 'pacman': {
'packages': { 'packages': {
'fish': {}, 'fish': {},