Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2020-10-23 12:22:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install" Fri Oct 23 12:22:18 2020 rev:171 rq:843491 version:0.10.10 Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2020-10-20 16:21:42.662330868 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new.3463/vm-install.changes 2020-10-23 12:23:48.920743926 +0200 @@ -1,0 +2,11 @@ +Thu Oct 22 15:10:30 MDT 2020 - [email protected] + +- jsc#SLE-11981 - Dev: vm-install: sync SLE and openSUSE Leap + differences + Modify the PV PXE booting feature to only allow a pxe server + address passed on command line. The use of udhcp to lookup a pxe + server is removed. +- Drop vm-install-extra-args.patch by folding fix into new tarball +- Version 0.10.10 + +------------------------------------------------------------------- @@ -5,0 +17 @@ +- Version 0.10.09 Old: ---- vm-install-0.10.08.tar.bz2 vm-install-extra-args.patch New: ---- vm-install-0.10.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.nvwSCQ/_old 2020-10-23 12:23:49.532744351 +0200 +++ /var/tmp/diff_new_pack.nvwSCQ/_new 2020-10-23 12:23:49.536744354 +0200 @@ -27,14 +27,13 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.10.08 +Version: 0.10.10 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0-only Group: System/Emulators/PC -Source0: %{name}-0.10.08.tar.bz2 +Source0: %{name}-0.10.10.tar.bz2 Source1: vm-install.conf -Patch1: vm-install-extra-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdump Requires: python3-dbus-python @@ -47,10 +46,6 @@ %else Requires: virt-utils %endif -# FATE324167: vm-install: remove deps on udhcp on SLE15 -%if 0%{?is_opensuse} && 0%{?suse_version} < 1500 -Requires: udhcp -%endif Requires: usbutils Requires: tftp(client) %define pysite %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())") @@ -81,7 +76,6 @@ %prep %setup -q -%patch1 -p1 %build ++++++ vm-install-0.10.08.tar.bz2 -> vm-install-0.10.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.08/Makefile new/vm-install-0.10.10/Makefile --- old/vm-install-0.10.08/Makefile 2020-02-10 22:33:43.367575493 +0100 +++ new/vm-install-0.10.10/Makefile 2020-10-22 23:13:21.384421870 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.10.08 +VER = 0.10.10 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.08/setup.py new/vm-install-0.10.10/setup.py --- old/vm-install-0.10.08/setup.py 2020-02-10 22:33:49.147351704 +0100 +++ new/vm-install-0.10.10/setup.py 2020-10-22 23:13:18.028421788 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.10.08', + version='0.10.10', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='[email protected]', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.08/src/vminstall/VMPXE.py new/vm-install-0.10.10/src/vminstall/VMPXE.py --- old/vm-install-0.10.08/src/vminstall/VMPXE.py 2018-02-20 22:32:41.622177258 +0100 +++ new/vm-install-0.10.10/src/vminstall/VMPXE.py 2020-10-22 23:06:56.308412455 +0200 @@ -50,60 +50,10 @@ def getServAddr(options): if options.pxe_addr: return options.pxe_addr - #Can't use dhclient, which will make network unstable - #FIXME 1: is there any better method to get the dhcp server IP - #which doesn't effect network status - #This method depend on udhcp-0.9.8-2 - if not os.path.exists('/sbin/udhcpc'): - raise PXEError(PXEError.E_NO_SERVER, details="/sbin/udhcpc \ -required for PXE server lookup. \nOptionally you may specify a PXE \ -Server IP on the command line.") - udhcpc_command="/sbin/udhcpc" - udhcpc_script="/usr/share/udhcpc/outputpy.udhcp.sh" - nics = options.nics - if (nics is not None and nics[0].bridge is not None): - bridge = nics[0].bridge - else: - if os.path.exists('/usr/sbin/bridge'): - brctl_cmd = '/usr/sbin/bridge link show' - legacy = False - else: - brctl_cmd = '/usr/sbin/brctl show' - legacy = True - rfd = os.popen(brctl_cmd) - data = rfd.read() - status = rfd.close() - if legacy is True: - lines = data.splitlines()[1:] - else: - lines = data.splitlines()[0:] - if not lines: - raise PXEError(PXEError.E_NO_BRIDGE) - line1 = lines[0] - words = line1.split() - if legacy is True: - bridge = words[0] - else: - bridge = words[9] - - log.debug("getServAddr: bridge: %s " % (bridge)) - full_cmd = [udhcpc_command, "-i", bridge, "-n", "-q", "-s", udhcpc_script] - try: - udhcp_result=subprocess.check_output(full_cmd, universal_newlines=True, stderr=subprocess.STDOUT) - except Exception as e: - raise PXEError(PXEError.E_NO_SERVER) - - udhcplines=udhcp_result.split('\n') - dhcpinfo={} - for line in udhcplines: - s = line.strip() - if (s.find('=') != -1): - f=s.split('=') - dhcpinfo[f[0]]=f[1] - - sa=dhcpinfo['siaddr'] - log.debug('Found PXE Server address (siaddr) = %s' % sa) - return sa + log.debug("Error: Using PV PXE booting now requires passing in a PXE boot server address.") + log.debug(" Specifying an IP address on the command line is required for this feature.") + log.debug(" See --pxe-boot <ip address>") + return None class VMPXE(VMLinux): global servaddr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.10.08/src/vminstall/gtk/interface.py new/vm-install-0.10.10/src/vminstall/gtk/interface.py --- old/vm-install-0.10.08/src/vminstall/gtk/interface.py 2018-02-07 22:19:13.103413935 +0100 +++ new/vm-install-0.10.10/src/vminstall/gtk/interface.py 2020-10-23 00:00:44.044491372 +0200 @@ -1179,6 +1179,8 @@ else: self.window.get_object('pv-src-network').set_sensitive(True) self.window.get_object('pv-src-network-url').set_sensitive(True) + if self.options.pxe_boot is None: + self.window.get_object('pv-src-pxe').set_sensitive(False) if type(source) is vmdisks.Disk or self.defaults.os_type == 'rear': self.window.get_object('pv-src-disk').set_active(True) elif self.options.os_type == 'pxe': @@ -1460,7 +1462,7 @@ self._exc_box(VmError(err=VmError.E_VM_RUNNING)) return if self.options.os_type in ('sles12', 'sled12', 'sles15', 'sled15'): - self.options.extra_args = "upgrade=1" + self.options.extra_args += " upgrade=1" # Initialize the internal data from the config file. Do this before calling calculate try: vminstall.options.initialize_vm_from_config_file(self.options, vm_name)
