CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-06-14 14:18:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fetch and replace soup scripts from 3/main before proceeding on 3.X.X

Browse Source
This commit is contained in:
Mike Reeves
2026-04-01 15:43:21 -04:00
parent 1355e8eb11
commit f2d6d8a3fe
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/manager/tools/sbin/soup
+16 -2
View File
@@ -2128,9 +2128,23 @@ failed_soup_restore_items() {
main() { main() {
trap 'check_err $?' EXIT trap 'check_err $?' EXIT
# If running 3.X.X, re-launch soup using the 3/main branch # If running 3.X.X, we need to fetch the correct soup and supporting scripts
# from the 3/main branch before proceeding, otherwise we'll clone 2.4/main
# and end up with incompatible scripts.
if [[ "$INSTALLEDVERSION" == 3.* && "$BRANCH" != "3/main" ]]; then if [[ "$INSTALLEDVERSION" == 3.* && "$BRANCH" != "3/main" ]]; then
echo "Detected Security Onion $INSTALLEDVERSION. Switching to 3/main branch." echo "Detected Security Onion $INSTALLEDVERSION. Fetching soup from 3/main branch."
rm -rf /tmp/sogh
mkdir -p /tmp/sogh
cd /tmp/sogh
git clone -b 3/main https://github.com/Security-Onion-Solutions/securityonion.git
if [ ! -f "$UPDATE_DIR/VERSION" ]; then
echo "Unable to clone 3/main branch from Github. Please check your Internet access."
exit 1
fi
cp "$UPDATE_DIR/salt/manager/tools/sbin/soup" /usr/sbin/soup
cp "$UPDATE_DIR/salt/common/tools/sbin/so-common" /usr/sbin/so-common
cp "$UPDATE_DIR/salt/common/tools/sbin/so-image-common" /usr/sbin/so-image-common
echo "Updated soup scripts from 3/main. Restarting soup."
exec env BRANCH=3/main soup "$@" exec env BRANCH=3/main soup "$@"
fi fi