ansible-base: removed

This commit is contained in:
adam 2022-05-14 04:44:02 +00:00
parent 121ee4cf4f
commit d112cc4524
2 changed files with 2 additions and 41 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1003 2022/05/12 08:07:34 adam Exp $
# $NetBSD: Makefile,v 1.1004 2022/05/14 04:44:02 adam Exp $
#
COMMENT= System utilities
@ -28,7 +28,7 @@ SUBDIR+= amanda-server
SUBDIR+= amlogic-meson-fwtools
SUBDIR+= amtterm
SUBDIR+= ansible
SUBDIR+= ansible-base
SUBDIR+= ansible-core
SUBDIR+= ansible-lint
SUBDIR+= apcupsd
SUBDIR+= arm-trusted-firmware-fiptool

View file

@ -1,39 +0,0 @@
$NetBSD: patch-lib_ansible_module__utils_facts_hardware_netbsd.py,v 1.1 2021/03/09 12:10:31 adam Exp $
use mount(8) to get run-time file systems instead of boot-time /etc/fstab
--- lib/ansible/module_utils/facts/hardware/netbsd.py.orig 2020-07-21 01:08:10.000000000 +0000
+++ lib/ansible/module_utils/facts/hardware/netbsd.py
@@ -116,20 +116,23 @@ class NetBSDHardware(Hardware):
mount_facts = {}
mount_facts['mounts'] = []
- fstab = get_file_content('/etc/fstab')
+ mount_cmd = self.module.get_bin_path('mount')
- if not fstab:
+ if not mount_cmd:
return mount_facts
- for line in fstab.splitlines():
- if line.startswith('#') or line.strip() == '':
- continue
+ rc, mount_out, err = self.module.run_command(mount_cmd)
+ if rc != 0:
+ return mount_facts
+
+ for line in mount_out.splitlines():
fields = re.sub(r'\s+', ' ', line).split()
- mount_statvfs_info = get_mount_size(fields[1])
- mount_info = {'mount': fields[1],
+ mount_statvfs_info = get_mount_size(fields[2])
+ mount_options = line[line.find("(")+1 : line.find(")")].replace(" ","")
+ mount_info = {'mount': fields[2],
'device': fields[0],
- 'fstype': fields[2],
- 'options': fields[3]}
+ 'fstype': fields[4],
+ 'options': mount_options}
mount_info.update(mount_statvfs_info)
mount_facts['mounts'].append(mount_info)
return mount_facts