DLPX-95335 delphix-sb-enroll.service fails on OCI VMs

tonynguien · web-flow · commit 8e8627c2c962 · 2025-09-08T13:30:29.000-06:00
PR URL: #547
diff --git a/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh b/files/common/var/lib/delphix-sb-enroll/sb-enroll-efivars.sh
@@ -9,10 +9,6 @@ die() {
 	exit 1
 }
 
-# Do nothing if Secure Boot is already enabled.
-sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* | awk '{print $NF}')
-[[ $sb -eq 1 ]] && exit 0
-
 #
 # Run only on AWS.
 #
@@ -27,6 +23,10 @@ fi
 
 [[ -d /sys/firmware/efi/efivars ]] || die "Not booted in UEFI mode (/sys/firmware/efi/efivars missing)."
 
+# Do nothing if Secure Boot is already enabled.
+sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* | awk '{print $NF}')
+[[ $sb -eq 1 ]] && exit 0
+
 # Ensure efivars is mounted (usually is on Ubuntu)
 if ! mountpoint -q /sys/firmware/efi/efivars; then
 	log "Mounting efivarfs..."

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,6 @@ die() {`
`9`	`9`	`exit 1`
`10`	`10`	`}`
`11`	`11`
`12`		`-# Do nothing if Secure Boot is already enabled.`
`13`		`-sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* \| awk '{print $NF}')`
`14`		`-[[ $sb -eq 1 ]] && exit 0`
`15`		`-`
`16`	`12`	`#`
`17`	`13`	`# Run only on AWS.`
`18`	`14`	`#`
`@@ -27,6 +23,10 @@ fi`
`27`	`23`
`28`	`24`	`[[ -d /sys/firmware/efi/efivars ]] \|\| die "Not booted in UEFI mode (/sys/firmware/efi/efivars missing)."`
`29`	`25`
	`26`	`+# Do nothing if Secure Boot is already enabled.`
	`27`	`+sb=$(od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-* \| awk '{print $NF}')`
	`28`	`+[[ $sb -eq 1 ]] && exit 0`
	`29`	`+`
`30`	`30`	`# Ensure efivars is mounted (usually is on Ubuntu)`
`31`	`31`	`if ! mountpoint -q /sys/firmware/efi/efivars; then`
`32`	`32`	`log "Mounting efivarfs..."`