boot/makebootable: prevent a "." recovery system label

soumyaDghosh · Sep 29, 2022 · 8fd6adc · 8fd6adc
1 parent 111c847
commit 8fd6adc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/boot/makebootable.go b/boot/makebootable.go
@@ -365,7 +365,11 @@ func makeRunnableSystem(model *asserts.Model, bootWith *BootableSet, sealer *Tru
 		currentTrustedBootAssets = sealer.currentTrustedBootAssetsMap()
 		currentTrustedRecoveryBootAssets = sealer.currentTrustedRecoveryBootAssetsMap()
 	}
-	recoverySystemLabel := filepath.Base(bootWith.RecoverySystemDir)
+	// filepath.Base("") returns ".", so we need to be a bit careful here
+	recoverySystemLabel := ""
+	if bootWith.RecoverySystemDir != "" {
+		recoverySystemLabel = filepath.Base(bootWith.RecoverySystemDir)
+	}
 	// write modeenv on the ubuntu-data partition
 	modeenv := &Modeenv{
 		Mode:           "run",