salt-3001p5 port patches: patch-salt_modules_vmctl_py
--- salt/modules/vmctl.py.orig Wed Jun 17 21:05:55 2020
+++ salt/modules/vmctl.py Sat Jul 25 20:24:23 2020
@@ -64,7 +64,7 @@
salt '*' vmctl.create_disk /path/to/disk.img size=10G
"""
ret = False
- cmd = "vmctl create {0} -s {1}".format(name, size)
+ cmd = "vmctl create -s {0} {1}".format(size, name)
result = __salt__["cmd.run_all"](cmd, output_loglevel="trace",
python_shell=False)
--- Makefile.orig Wed Jul 15 13:29:15 2020
+++ Makefile Sat Jul 25 21:30:41 2020
@@ -19,7 +19,7 @@
MODPY_EGG_VERSION = 3001
DISTNAME = salt-${MODPY_EGG_VERSION}
-REVISION = 4
+REVISION = 5
CATEGORIES = sysutils net devel
Maybe vmctl.py should be patched on github in salt upstream to prevent patching
locally.
Martin
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Saturday, July 25, 2020 8:59 AM, Theo Buehler <[email protected]> wrote:
> On Sat, Jul 25, 2020 at 08:43:55AM +0000, Martin wrote:
>
> > I use python-3.8.3p0 from -current ports to run salt if it was matter.
>
> > Martin
> > ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
> > On Saturday, July 25, 2020 8:14 AM, Martin [email protected] wrote:
> >
> > > I'm very new in saltstack and first time I run it beginning from version
> > > 3001 from -current port.
> > > When I try to create a disk image as officially documented here:
> > > https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.vmctl.html
> > > salt '*' vmctl.create_disk /home/vmm/disk.img size=10G
> > > =======================================================
> > > I receive error:
> > > web.host:
> > > ERROR: Problem encountered creating disk image. Additional info follows:
> > > changes:
> > > False
> > > errors:
> > >
> > > - could not create /home/vmm/disk.img: missing size argument
> > > usage: vmctl [-v] create [-b base | -i disk] [-s size] disk
> > >
>
> Looks like thevmctl.py module
>
> https://github.com/saltstack/salt/blob/a670b4ae72ec11f5485c216c54059e14223019b8/salt/modules/vmctl.py
>
> was never updated to be compatible with the "new" vmctl argument order
> introduced in OpenBSD 6.6:
>
> https://www.openbsd.org/faq/upgrade66.html
> https://github.com/openbsd/src/commit/bd4b76f8bf7d2ecdff4c441cb97ece9ad94422c4
Makefile.diff
Description: Binary data
patch-salt_modules_vmctl_py
Description: Binary data
