Merge ~mfo/ubiquity:lp1898129 into ubiquity:master

[Mauricio Faria de Oliveira]

Introduce preseed option partman-crypto/luksformat_options

This allows preseeding additional options to 'cryptsetup luksFormat'.
(LP: #1898129)

P.S.: This change has been submitted to the stand-alone repo [1].

[1] https://code.launchpad.net/~mfo/partman-crypto/+git/partman-crypto/+merge/391766

[Łukasz Zemczak (sil2100)]

Hey Mauricio! Thanks for the MP! For ubiquity inside components though, we have a special process that we're trying to follow using git subtrees (per d-i/source/README). I'll reject this merge and pull in the latest partman-crypto changes myself, merge and release.

Cheers!

review: Needs Resubmitting

[Łukasz Zemczak (sil2100)]

Merged and released!

[Mauricio Faria de Oliveira (mfo)]

Thanks, Łukasz!

Unmerged commits

677c853... by Mauricio Faria de Oliveira on 2020-10-02

Introduce preseed option partman-crypto/luksformat_options

This allows preseeding additional options to 'cryptsetup luksFormat'.
(LP: #1898129)

P.S.: This change has been submitted to the stand-alone repo.

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

diff --git a/d-i/source/partman-crypto/debian/changelog b/d-i/source/partman-crypto/debian/changelog
index b05458d..645b125 100644
--- a/d-i/source/partman-crypto/debian/changelog
+++ b/d-i/source/partman-crypto/debian/changelog
@@ -1,3 +1,12 @@
+partman-crypto (101ubuntu5) hirsute; urgency=medium
+
+  * Add preseed option 'partman-crypto/luksformat_options' to
+    provide more options for 'cryptsetup luksFormat' (LP: #1898129)
+    - d/partman-crypto.templates: add preseed option.
+    - lib/crypto-base.sh: check for, log, and use it.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Thu, 05 Nov 2020 12:24:33 -0300
+
 partman-crypto (101ubuntu4) eoan; urgency=medium
 
   * Drop a big block in finish.d that iterates partman, and then does
diff --git a/d-i/source/partman-crypto/debian/partman-crypto.templates b/d-i/source/partman-crypto/debian/partman-crypto.templates
index ee78111..3541934 100644
--- a/d-i/source/partman-crypto/debian/partman-crypto.templates
+++ b/d-i/source/partman-crypto/debian/partman-crypto.templates
@@ -509,3 +509,8 @@ _Description: Passphrase for ${DEVICE}:
  Please enter the passphrase for the encrypted volume ${DEVICE}.
  .
  If you don't enter anything, the volume will not be activated.
+
+Template: partman-crypto/luksformat_options
+Type: string
+Description: for internal use; can be preseeded.
+ Provide additional options to the cryptsetup luksFormat command.
diff --git a/d-i/source/partman-crypto/lib/crypto-base.sh b/d-i/source/partman-crypto/lib/crypto-base.sh
index 7616ad2..d3ed948 100644
--- a/d-i/source/partman-crypto/lib/crypto-base.sh
+++ b/d-i/source/partman-crypto/lib/crypto-base.sh
@@ -205,7 +205,7 @@ setup_dmcrypt () {
 }
 
 setup_luks () {
-	local mapping device cipher iv size pass
+	local mapping device cipher iv size pass luksopts
 	mapping=$1
 	device=$2
 	cipher=$3
@@ -234,7 +234,11 @@ setup_luks () {
 	fi
 
 	if [ $zkey_available -eq 0 ]; then
-		log-output -t partman-crypto /sbin/cryptsetup -c $cipher-$iv -h $hash -s $size luksFormat $device $pass
+		if db_get partman-crypto/luksformat_options; then
+			luksopts="$RET"
+			log "Additional options for luksFormat: '$luksopts'"
+		fi
+		log-output -t partman-crypto /sbin/cryptsetup -c $cipher-$iv -h $hash -s $size $luksopts luksFormat $device $pass
 		if [ $? -ne 0 ]; then
 			log "luksFormat failed"
 			return 2
diff --git a/debian/changelog b/debian/changelog
index 3a242a7..552ff03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubiquity (21.04.1) UNRELEASED; urgency=medium
+
+  * Introduce preseed option partman-crypto/luksformat_options (LP: #1898129)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Thu, 05 Nov 2020 12:23:11 -0300
+
 ubiquity (20.10.13) groovy; urgency=medium
 
   * misc.py: unset gsd keys to trigger keyboard settings migration.