From e58f2c396fa82d272a7afebedae0690db4384314 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 25 Jan 2020 08:50:20 +0100 Subject: VMware: move additional files to vyos-1x-vmware package --- .../scripts/resume-vm-default.d/ether-resume.py | 60 ---------------------- data/package-lists/vyos-x86.list.chroot | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100755 data/live-build-config/includes.chroot/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py (limited to 'data') diff --git a/data/live-build-config/includes.chroot/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py b/data/live-build-config/includes.chroot/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py deleted file mode 100755 index 72da317f..00000000 --- a/data/live-build-config/includes.chroot/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2018-2020 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import sys -import subprocess -import syslog as sl - -from vyos.config import Config -from vyos.util import vyos - -def get_config(): - c = Config() - interfaces = dict() - for intf in c.list_effective_nodes('interfaces ethernet'): - # skip interfaces that are disabled or is configured for dhcp - check_disable = "interfaces ethernet {} disable".format(intf) - check_dhcp = "interfaces ethernet {} address dhcp".format(intf) - if c.exists_effective(check_disable) or c.exists_effective(check_dhcp): - continue - - # get addresses configured on the interface - intf_addresses = c.return_effective_values( - "interfaces ethernet {} address".format(intf) - ) - interfaces[intf] = [addr.strip("'") for addr in intf_addresses] - return interfaces - -def apply(config): - for intf, addresses in config.items(): - # bring the interface up - cmd = ["ip", "link", "set", "dev", intf, "up"] - sl.syslog(sl.LOG_NOTICE, " ".join(cmd)) - subprocess.call(cmd) - - # add configured addresses to interface - for addr in addresses: - cmd = ["ip", "address", "add", addr, "dev", intf] - sl.syslog(sl.LOG_NOTICE, " ".join(cmd)) - subprocess.call(cmd) - -if __name__ == '__main__': - try: - config = get_config() - apply(config) - except vyos.ConfigError as e: - print(e) - sys.exit(1) diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index b6caa914..fa66a5d3 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -1,8 +1,8 @@ grub2 grub-pc -open-vm-tools qemu-guest-agent hyperv-daemons vyos-netplug vyos-smoketest vyos-xe-guest-utilities +vyos-1x-vmware -- cgit v1.2.3