Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@chotea
Copy link
Collaborator

@chotea chotea commented Nov 27, 2025

Merges the changes that we made to salt 3006.13 on our dev fork, into this NI fork.

skizunov and others added 30 commits July 30, 2025 09:31
… NSIS/MSI/WIX installers

- Instead of installing Python using relenv, the build script takes a PythonDir parameter that build_python will use when called by build. build_python will copy the contents of the specified folder to the buildenv folder
- Remove NSIS/WIX/MSI installer creation as we do not need it; we do want to keep the cleanup logic from the original build scripts
- Remove Python environment usage from build_python as using an environment conflicts with the NI installer framework, which uses an environment of its own

Signed-off-by: Alexandru Dan Duna <[email protected]>
These batch files are used by NI software. We're keeping them in for the time being.

Signed-off-by: Alexandru Dan Duna <[email protected]>
- xcopy does not properly handle paths that use slashes instead of backslashes. Replace xcopy with Powershell's Copy-Item.
- Add logging of Python path

Signed-off-by: Alexandru Dan Duna <[email protected]>
… use

Touch `data['ipv6']` before referencing it to avoid exception.

Signed-off-by: Haris Okanovic <[email protected]>
The commands to install and upgrade (and remove) all support the option, which
is useful for clients that will query the restartcheck module and initiate a
system reboot if needed. This omits unnecessary work and makes install faster.

Signed-off-by: Dan Mondrik <[email protected]>
This fixes lint warnings from the previous submission.

Signed-off-by: Dan Mondrik <[email protected]>
NISysAPI expert .ini conf files can also be installed separately in a
conf.d directory as opposed to all expert configuration living in the
global .ini config file.

This change makes restartcheck and opkg aware of changes to the sysapi
conf.d by tracking the total number of files and each file's timestamp
and checksum.

Signed-off-by: Ioan-Adrian Ratiu <[email protected]>
Hide ethernet interfaces that have no link connection/connman service
since changing configuration results in an error because of missing
support.

Signed-off-by: Alexandru Vasiu <[email protected]>
Fixed is_running to support multiple functions
fixed data.get fun
We need the jid in the execution modules ran from state
to be able to publish the software installation progress
information.

Signed-off-by: Cristian Hotea <[email protected]>
Using salt-api was triggering the loader to
load all auth modules, and trying to load
pam on Windows failed because find_library('C')
returns None, and when it tries to create a handle
out of it it expects a string.

Signed-off-by: Rares POP <[email protected]>
Previously if it was moving past 5,
the function returned None, and that
was used below to get 'retcode' and
whatnot, and was failing.
Now if the last attempt fails, return
that failed output.

Signed-off-by: Rares POP <[email protected]>
By default we should support feed renaming when
applying the change from a state.
Updated opkg module to rename the repo based on the
new flag.

Signed-off-by: Cristian Hotea <[email protected]>
chotea and others added 21 commits August 26, 2025 16:54
This is needed because python 3.12 dropped the support
for find_module function. The fix is similar with the from
upstream six benjaminp/six@2591629

Signed-off-by: Cristian Hotea <[email protected]>
It was crashing due unitialized AESFuncs. They was initialized on constructor of the object and not on deserialization __setstate__.
Also presence_events was not populated.
In commit f9f783d#diff-8a276cfe45c79e02fa75a4725a175a312707cac0234e711a7dcbcf7b8f11f11d:~:text=Commit-,f9f783d,-Browse%20files, I mistakenly used underscores, instead of hyphens, for the name of the opt used to retrieve the NI Api Key.
In commit f9f783d#diff-8a276cfe45c79e02fa75a4725a175a312707cac0234e711a7dcbcf7b8f11f11d:~:text=Commit-,f9f783d,-Browse%20files, I used wrong names for the dict keys referring to the `x-ni-api-key` (correct ones: https://github.com/ni/salt/blob/c4c662034de249841908e723da4d0ec2e907f2a2/salt/transport/tcp.py#L489).

Also, use `dict`'s `get` method, as that returns None, instead of yielding a key error, when the key does not exist.
The class AsyncPubChannel has no ttype property, unlinke the class AsyncReqChannel, in the same file. This has been overlooked when cherry-picking the x-ni-api-key commit.
…n the master to fix session file creation

On windows, the Python's `os.rename` yields a FileAlreadyExists error when the destination passed to  `os.rename` already exists, unlike Linux, where the replace is performed with no issues. 

This leads to errors when using a Windows master.

This PR replaces the call to `os.rename` to a call to `os.replace`.
Fix indentation of code snippet that was wrongfully cherry-picked
Fix errors that we made when cherry-picking some OPKG module-related changes
…elenv (#4)

Revert changes to build.ps1 and build_python.ps1, as we'll no longer be using these

Add environment variable to build all binaries for Salt on Windows in install_salt.ps1

Adapt our .bat files (used by parts of SLS to interact with salt) to the python.exe path in the relenv-generated python environment
…er exception handling (#8)

* Convert StreamClosedError to SaltClientError in salt/channel/client.py
We want to have a single requirements file for both our custom salt modules, and salt itself, outside of this repository. Since we're running install_salt.ps1 as part of our external build system, we don't want this script to install salt's own dependencies anymore.
@chotea chotea changed the title Merge salt 3006.x changes from dev fork #75 Merge salt 3006.x changes from dev fork Nov 27, 2025
@chotea chotea merged commit 5c88256 into ni:ni/master/3006.x Nov 27, 2025
20 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.