@@ -67,7 +67,7 @@ rm -rf "$OLD_TUF_PATH"
67
67
rm -rf " $NEW_TUF_PATH "
68
68
pkill file-server || true
69
69
70
- echo " Restoring update_channels for \" No team\" to 'sstable ' defaults..."
70
+ echo " Restoring update_channels for \" No team\" to 'stable ' defaults..."
71
71
cat << EOF > upgrade.yml
72
72
---
73
73
apiVersion: v1
@@ -371,7 +371,7 @@ echo "Installing fleetd package on macOS..."
371
371
sudo installer -pkg fleet-osquery.pkg -verbose -target /
372
372
373
373
CURRENT_DIR=$( pwd)
374
- prompt " Please install $CURRENT_DIR /fleet-osquery.msi and $CURRENT_DIR /fleet-osquery_${OLD_FULL_VERSION } _amd64.deb."
374
+ prompt " Please install $CURRENT_DIR /fleet-osquery.msi and $CURRENT_DIR /fleet-osquery_${NEW_FULL_VERSION } _amd64.deb."
375
375
376
376
echo " Waiting until installation and auto-update to new repository happens..."
377
377
for host_hostname in " ${hostnames[@]} " ; do
@@ -456,6 +456,13 @@ done
456
456
457
457
458
458
echo " Building fleetd packages using new repository and new fleetctl version..."
459
+
460
+ CGO_ENABLED=0 go build \
461
+ -o ./build/fleetctl \
462
+ -ldflags=" -X github.com/fleetdm/fleet/v4/orbit/pkg/update.defaultRootMetadata=$ROOT_KEYS2 \
463
+ -X github.com/fleetdm/fleet/v4/orbit/pkg/update.DefaultURL=$NEW_TUF_URL " \
464
+ ./cmd/fleetctl
465
+
459
466
for pkgType in " ${pkgTypes[@]} " ; do
460
467
./build/fleetctl package --type=" $pkgType " \
461
468
--enable-scripts \
@@ -464,8 +471,6 @@ for pkgType in "${pkgTypes[@]}"; do
464
471
--enroll-secret=" $NO_TEAM_ENROLL_SECRET " \
465
472
--fleet-certificate=./tools/osquery/fleet.crt \
466
473
--debug \
467
- --update-roots=" $ROOT_KEYS2 " \
468
- --update-url=$NEW_TUF_URL \
469
474
--disable-open-folder \
470
475
--disable-keystore \
471
476
--update-interval=30s
0 commit comments