diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2010-11-17 03:40:41 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-17 03:40:41 (GMT) |
| commit | 17d10984add49e64ede3ef9172a4adb273fb5dc1 (patch) | |
| tree | 4d3e611ed2c90a21e30f05c9c3c08955e610a3cb /abs/core/cryptsetup | |
| parent | e474cef679de2bacaeb4e858f92eaa55887f7665 (diff) | |
| download | linhes_pkgbuild-17d10984add49e64ede3ef9172a4adb273fb5dc1.zip linhes_pkgbuild-17d10984add49e64ede3ef9172a4adb273fb5dc1.tar.gz linhes_pkgbuild-17d10984add49e64ede3ef9172a4adb273fb5dc1.tar.bz2 | |
housekeeping
Diffstat (limited to 'abs/core/cryptsetup')
| -rw-r--r-- | abs/core/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch | 29 | ||||
| -rw-r--r-- | abs/core/cryptsetup/luksOpen-status.patch | 13 |
2 files changed, 0 insertions, 42 deletions
diff --git a/abs/core/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch b/abs/core/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch deleted file mode 100644 index 28f85e6..0000000 --- a/abs/core/cryptsetup/cryptsetup-1.0.5-run_udevsettle.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: cryptsetup-1.0.5/lib/libdevmapper.c -=================================================================== ---- cryptsetup-1.0.5.orig/lib/libdevmapper.c -+++ cryptsetup-1.0.5/lib/libdevmapper.c -@@ -18,6 +18,13 @@ - - #define CRYPT_TARGET "crypt" - -+#define UDEVSETTLE "/sbin/udevsettle" -+ -+static void run_udevsettle(void) -+{ -+ system(UDEVSETTLE); -+} -+ - static void set_dm_error(int level, const char *file, int line, - const char *f, ...) - { -@@ -184,6 +191,9 @@ static int dm_create_device(int reload, - if (dmi.read_only) - options->flags |= CRYPT_FLAG_READONLY; - -+ /* run udevsettle to avoid problems with busy dm devices */ -+ run_udevsettle(); -+ - r = 0; - - out: - diff --git a/abs/core/cryptsetup/luksOpen-status.patch b/abs/core/cryptsetup/luksOpen-status.patch deleted file mode 100644 index d2e4004..0000000 --- a/abs/core/cryptsetup/luksOpen-status.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur cryptsetup-luks-1.0.4.orig/src/cryptsetup.c cryptsetup-luks-1.0.4/src/cryptsetup.c ---- cryptsetup-luks-1.0.4.orig/src/cryptsetup.c 2006-10-04 15:47:00.000000000 +0200 -+++ cryptsetup-luks-1.0.4/src/cryptsetup.c 2006-12-16 15:54:12.000000000 +0100 -@@ -249,7 +249,8 @@ - if (opt_readonly) - options.flags |= CRYPT_FLAG_READONLY; - r = crypt_luksOpen(&options); -- show_status(-r); -+ if(r) -+ show_status(-r); - return r; - } - |