From 024c5541013b587e81f4fd7096a2057ba1797d19 Mon Sep 17 00:00:00 2001 From: Thiemo Nagel Date: Mon, 14 Oct 2013 09:52:28 +0200 Subject: [PATCH] Remove trailing whitespace --- README | 22 +++++++++++----------- TODO | 4 ++-- blockdev-wipe/Makefile | 2 +- blockdev-wipe/blockdev-wipe.c | 2 +- debian/changelog | 14 +++++++------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README b/README index 21894ec..59f9b73 100644 --- a/README +++ b/README @@ -33,11 +33,11 @@ init.d/ crypto Creates the partman cryptdisks once for each crypto partition. - + update.d/ crypto_visuals - Shows "crypt" in the method column, and the name of the crypt disk as + Shows "crypt" in the method column, and the name of the crypt disk as mountpoint, so the user can see which dm device is which after they have been setup. @@ -45,26 +45,26 @@ finish.d/ crypto_check_mountpoints Shows a warning if user chose to create a filesystem on a crypt disk - with keytype random. User can force to continue, maybe that should + with keytype random. User can force to continue, maybe that should eventually be disabled. Note: random keytype can make sense for the /tmp partition, but actually requires random/1777 keytype. - + finish.d/ crypto_config - + Adds crypttab entries. finish.d/ crypto_aptinstall - Installs userspace tools and helper packages for encryption. This + Installs userspace tools and helper packages for encryption. This is responsible for installing installs cryptsetup etc. blockdev-keygen - - Asks for a passphrase, confirms that it has been entered correctly + + Asks for a passphrase, confirms that it has been entered correctly and optionally tests for a minimum length. - + This script uses the cdebconf plugin "entropy" if available. See notes at the beginning of the script for important steps for the caller. @@ -73,7 +73,7 @@ ciphers/$crypt_type/$cipher Lists supported ciphers for each crypt_type. The following files exist for each cipher directory. They are used to display a short - description of the cipher for the user and to determine allowed + description of the cipher for the user and to determine allowed crypto parameters (TODO): - desc (description) @@ -81,7 +81,7 @@ ciphers/$crypt_type/$cipher Structure is ciphers/$crypt_type/$cipher/ - + mountoptions mountoptions/crypto diff --git a/TODO b/TODO index b223328..49c025e 100644 --- a/TODO +++ b/TODO @@ -1,11 +1,11 @@ IMPORTANT - o Check that the tests in choose_partition/crypto/do_option cover + o Check that the tests in choose_partition/crypto/do_option cover all cases in which unencrypted swap may be setup. GENERAL - o Find a better way to check required libraries that were installed + o Find a better way to check required libraries that were installed indirectly by crypto_load_udebs() o Understand and add undo.d scripts if required diff --git a/blockdev-wipe/Makefile b/blockdev-wipe/Makefile index 70ed778..c61466c 100644 --- a/blockdev-wipe/Makefile +++ b/blockdev-wipe/Makefile @@ -2,7 +2,7 @@ CFLAGS = -Wall -Os -s STRIP = strip blockdev-wipe: blockdev-wipe.c - $(CC) $(CFLAGS) -o $@ $< + $(CC) $(CFLAGS) -o $@ $< $(STRIP) -s $@ clean: diff --git a/blockdev-wipe/blockdev-wipe.c b/blockdev-wipe/blockdev-wipe.c index dfced12..8da1fc2 100644 --- a/blockdev-wipe/blockdev-wipe.c +++ b/blockdev-wipe/blockdev-wipe.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 David Härdeman - * + * * 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 2 of the License, or diff --git a/debian/changelog b/debian/changelog index cd06904..f029c7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -339,7 +339,7 @@ partman-crypto (39) unstable; urgency=low add corresponding versioned depends. * Use partman_list_allowed from partman-base. * Correct call to disable_swap. Requires partman-base >= 134. - * Use UUID= to specify source device in /etc/crypttab. + * Use UUID= to specify source device in /etc/crypttab. [ Updated translations ] * Esperanto (eo.po) by Felipe Castro @@ -481,7 +481,7 @@ partman-crypto (34) unstable; urgency=low * French (fr.po) by Christian Perrier * Croatian (hr.po) by Josip Rodin * Turkish (tr.po) by Mert Dirik - + -- Otavio Salvador Tue, 05 Aug 2008 13:51:40 -0300 partman-crypto (33) unstable; urgency=low @@ -726,7 +726,7 @@ partman-crypto (23) unstable; urgency=low * Reduce noise from repeated 'debian/rules clean' runs. [ Max Vozeler ] - * Correct dependencies in base64/Makefile; Thanks to + * Correct dependencies in base64/Makefile; Thanks to Robert Millan for report + patch. Closes: #452830 * Drop use of the obsolete /dev/loop/ directory * Make erase cancellable. Closes: #381898, #400034 @@ -1010,7 +1010,7 @@ partman-crypto (10) unstable; urgency=low * Add lintian override for no-standards-version-field * Check for unencrypted swap in commit.d/unsafe_swap to catch setup after encrypted devices. Closes: #381870 - * Set name of dm-crypt devices according to the underlying + * Set name of dm-crypt devices according to the underlying block devices (e.g. hda5_crypt). Closes: #382398 [ David Härdeman ] @@ -1052,7 +1052,7 @@ partman-crypto (9) unstable; urgency=low * blockdev-wipe: To compensate for the performance impact of O_SYNC increase blocksize from 4k to 64k. - * crypto_tools.sh: Use 128 bit (instead of 256 bit) + * crypto_tools.sh: Use 128 bit (instead of 256 bit) random key when setting up dm-crypt for partition erase. This should speed up erase a bit. Also take the key from /dev/urandom so we don't risk a blocking read. @@ -1274,11 +1274,11 @@ partman-crypto (2) unstable; urgency=low [ Max Vozeler ] * Depend on loop-aes-modules (provided by loop-aes-$KVERS-di) - * Check that a separate /boot partition exists if the root + * Check that a separate /boot partition exists if the root partition is encrypted. Thanks to Riku Voipio. * Use debconf_select in crypto_dooption; Option values can now be translated if corresponding templates exist. - * Actually build the package in binary-arch, not binary-indep + * Actually build the package in binary-arch, not binary-indep (leftover from switch to arch: any) [ Frans Pop ] -- 1.7.10.4