Merge remote-tracking branch 'origin/6.0/stage' into 6.0/release

delphix · Mar 31, 2023 · 47f1d0c · 47f1d0c
2 parents 6d8e897 + 14910ad
commit 47f1d0c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/upgrade/upgrade-scripts/upgrade-container b/upgrade/upgrade-scripts/upgrade-container
@@ -593,7 +593,10 @@ function run() {
 	# the upgrade. Thus, to try and avoid the failure to begin with,
 	# we restart this service, which serves to run "daemon-reexec".
 	#
-	systemctl restart systemd-reexec.service
+	# This will fail on versions of Delphix that don't yet have
+	# this service, so we hide any failure to account for that.
+	#
+	systemctl restart systemd-reexec.service 2>/dev/null
 
 	systemd-run \
 		--machine="$CONTAINER" \