Hi Jonas, On Wed, 23 Dec 2015 at 23:11:29 +0100, Jonas Meurer wrote: > Guilhem, can you test the latest SVN version and verify that it works fo > you?
It works great, thanks! Here is another patch to - add an entry in d/copyright; - change cryptroot-unlock's license from GPL3+ to GPL2+ to match other parts of the package; and - add a lintian override regarding the “unusual shell interpreter” Cheers, -- Guilhem.
From f6f78b1cfd42d18d878c72b594e5474460f888a6 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin <guil...@guilhem.org> Date: Thu, 24 Dec 2015 20:30:58 +0100 Subject: [PATCH] cryptroot-unlock: change license to GPL2+ and change the shebang to '/bin/busybox ash'. --- debian/copyright | 4 ++++ debian/cryptsetup.lintian-overrides | 2 ++ debian/initramfs/cryptroot-unlock | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 981b88c..435b11e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -36,6 +36,10 @@ Files: debian/scripts/luksformat Copyright: © 2005 Canonical Ltd. License: GPL-2+ +Files: debian/initramfs/cryptroot-unlock +Copyright: © 2015 Guilhem Moulin <guil...@guilhem.org> +License: GPL-2+ + License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/cryptsetup.lintian-overrides b/debian/cryptsetup.lintian-overrides index 32d04bf..0d74b30 100644 --- a/debian/cryptsetup.lintian-overrides +++ b/debian/cryptsetup.lintian-overrides @@ -6,3 +6,5 @@ cryptsetup: init.d-script-does-not-source-init-functions etc/init.d/cryptdisks cryptsetup: init.d-script-does-not-source-init-functions etc/init.d/cryptdisks-early cryptsetup: init.d-script-not-included-in-package etc/init.d/cryptdisks-udev cryptsetup: no-debconf-config +# `cryptroot-unlock` is meant to be run from the initramfs image, using busybox's /bin/ash +unusual-interpreter usr/share/cryptsetup/initramfs/bin/cryptroot-unlock #!/bin/busybox diff --git a/debian/initramfs/cryptroot-unlock b/debian/initramfs/cryptroot-unlock index 575b7dc..4ae8810 100644 --- a/debian/initramfs/cryptroot-unlock +++ b/debian/initramfs/cryptroot-unlock @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/busybox ash # Remotely unlock encrypted volumes. # @@ -6,7 +6,7 @@ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, -- 2.6.4
signature.asc
Description: PGP signature
