CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

use script from develop branch

Browse Source
This commit is contained in:
m0duspwnens
2023-10-12 13:09:07 -04:00
parent ab4c5acd0c
commit 8dc163f074
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
salt/salt/scripts/bootstrap-salt.sh
View File

@@ -596,6 +596,7 @@ fi
echoinfo "Running version: ${__ScriptVersion}" echoinfo "Running version: ${__ScriptVersion}"
echoinfo "Executed by: ${CALLER}" echoinfo "Executed by: ${CALLER}"
echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'" echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
echowarn "Running the unstable version of ${__ScriptName}"
# Define installation type # Define installation type
if [ "$#" -gt 0 ];then if [ "$#" -gt 0 ];then
@@ -1523,7 +1524,7 @@ __check_dpkg_architecture() {
else else
# Saltstack official repository has arm64 metadata beginning with Debian 11, # Saltstack official repository has arm64 metadata beginning with Debian 11,
# use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent
if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
__REPO_ARCH="amd64" __REPO_ARCH="amd64"
else else
__REPO_ARCH="arm64" __REPO_ARCH="arm64"
@@ -1709,6 +1710,14 @@ __debian_codename_translation() {
"11") "11")
DISTRO_CODENAME="bullseye" DISTRO_CODENAME="bullseye"
;; ;;
"12")
DISTRO_CODENAME="bookworm"
# FIXME - TEMPORARY
# use bullseye packages until bookworm packages are available
DISTRO_CODENAME="bullseye"
DISTRO_MAJOR_VERSION=11
rv=11
;;
*) *)
DISTRO_CODENAME="stretch" DISTRO_CODENAME="stretch"
;; ;;
@@ -2196,7 +2205,7 @@ __dnf_install_noinput() {
#--- FUNCTION ------------------------------------------------------------------------------------------------------- #--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: __tdnf_install_noinput # NAME: __tdnf_install_noinput
# DESCRIPTION: (DRY) dnf install with noinput options # DESCRIPTION: (DRY) tdnf install with noinput options
#---------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------
__tdnf_install_noinput() { __tdnf_install_noinput() {
@@ -7033,15 +7042,17 @@ install_photon_git_deps() {
"${__python}" -m pip install "${dep}" || return 1 "${__python}" -m pip install "${dep}" || return 1
done done
else else
__PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc" __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
__tdnf_install_noinput ${__PACKAGES} || return 1 __tdnf_install_noinput ${__PACKAGES} || return 1
fi fi
if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then
# Need newer version of setuptools on Photon # Need newer version of setuptools on Photon
_setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}" _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'" echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'"
${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}" ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
fi
# Let's trigger config_salt() # Let's trigger config_salt()
if [ "$_TEMP_CONFIG_DIR" = "null" ]; then if [ "$_TEMP_CONFIG_DIR" = "null" ]; then

0
salt/salt/scripts/bs_dev Normal file
View File

0
salt/salt/scripts/bs_stable Normal file
View File