diff options
author | Guilhem Moulin <guilhem@fripost.org> | 2015-05-08 17:14:13 +0200 |
---|---|---|
committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 04:28:18 +0200 |
commit | cdec2e76b4b1af00e10ce3bb72ee74e33d52083b (patch) | |
tree | 34e49f062ea50d0428d56dfb93cc953fde940a6c /src/fripost-postinst-udeb/finish-install.d/07fripost | |
parent | 61bb46a89b9f73055102b369451b6e64f63d45df (diff) |
Make the encrypted installation work with Jessie.
Diffstat (limited to 'src/fripost-postinst-udeb/finish-install.d/07fripost')
-rwxr-xr-x | src/fripost-postinst-udeb/finish-install.d/07fripost | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/fripost-postinst-udeb/finish-install.d/07fripost b/src/fripost-postinst-udeb/finish-install.d/07fripost index e583d5a..90df7b8 100755 --- a/src/fripost-postinst-udeb/finish-install.d/07fripost +++ b/src/fripost-postinst-udeb/finish-install.d/07fripost @@ -109,19 +109,10 @@ if [ "$encrypt" = true ]; then port=$(/target/usr/bin/od -An -N2 -i /dev/urandom) port=$(( $port % ($max + 1 - $min) + $min )) fi - # See dropbear(8) for the list of options. Failure to read a keyfile - # makes dropbear disable the corresponding algorithm (including - # key-based authentication), in our case DSS/DSA. - # XXX This is a dirty fix for bug #614981 + + # See dropbear(8) for the list of options. log "Changing dropbear's options; port $port" - sed -i "s@^\s*/sbin/dropbear\$@& -d '' -sgjk -p $port@" \ - /target/usr/share/initramfs-tools/scripts/init-premount/dropbear - - # Sadly /usr/lib/finish-install.d/10update-initramfs only updates - # the ramdisk if both cryptsetup *and* console-setup are installed. - # (Cf. #694156 and #696773.) So we perform the update manually here. - progress "Generating new initramfs image" - /bin/in-target /usr/sbin/update-initramfs -u -t + echo "PKGOPTION_dropbear_OPTION=\"-sgjk -p $port\"" >>/target/etc/initramfs-tools/initramfs.conf fi |