diff options
author | 2009-08-16 18:42:04 +0000 | |
---|---|---|
committer | 2009-08-16 18:42:04 +0000 | |
commit | 0bca8fa6976da8d07393fc78ffd67975792e14b1 (patch) | |
tree | ae802568529df827d1724f94ca108b03c1fbf004 /sys-fs/cryptsetup | |
parent | Depend on xz-utils or lzma-utils. (diff) | |
download | gentoo-2-0bca8fa6976da8d07393fc78ffd67975792e14b1.tar.gz gentoo-2-0bca8fa6976da8d07393fc78ffd67975792e14b1.tar.bz2 gentoo-2-0bca8fa6976da8d07393fc78ffd67975792e14b1.zip |
Do not complain if udevadm did not exec for systems that use mdev and such #276369 by Florian Streibelt.
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 7 | ||||
-rw-r--r-- | sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch | 18 |
2 files changed, 8 insertions, 17 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 8ea0f5c861c1..6db54a676331 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.72 2009/07/15 18:41:14 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.73 2009/08/16 18:42:04 vapier Exp $ + + 16 Aug 2009; Mike Frysinger <vapier@gentoo.org> + files/cryptsetup-1.0.6-udevsettle.patch: + Do not complain if udevadm did not exec for systems that use mdev and such + #276369 by Florian Streibelt. 15 Jul 2009; nixnut <nixnut@gentoo.org> cryptsetup-1.0.6-r2.ebuild: ppc stable #259253 diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch index 0d28732471e2..6860a7c4c34c 100644 --- a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch +++ b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch @@ -1,12 +1,9 @@ 2008-09-13 Doug Goldstein <cardoe@gentoo.org> * switch to udevadm settle since udevsettle has been deprecated and finally removed with udev 126. - * add message if udevadm settle fails to execute properly what the - consequence is -diff -Nur cryptsetup-1.0.6/lib/libdevmapper.c cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c ---- cryptsetup-1.0.6/lib/libdevmapper.c 2007-10-25 03:11:19.000000000 -0400 -+++ cryptsetup-1.0.6-udevsettle/lib/libdevmapper.c 2008-09-13 21:22:56.000000000 -0400 +--- cryptsetup-1.0.6/lib/libdevmapper.c ++++ cryptsetup-1.0.6/lib/libdevmapper.c @@ -18,11 +18,11 @@ #define CRYPT_TARGET "crypt" @@ -22,14 +19,3 @@ diff -Nur cryptsetup-1.0.6/lib/libdevmapper.c cryptsetup-1.0.6-udevsettle/lib/li } static void set_dm_error(int level, const char *file, int line, -@@ -192,7 +192,9 @@ - options->flags |= CRYPT_FLAG_READONLY; - - /* run udevsettle to avoid a race in libdevmapper causing busy dm devices */ -- run_udevsettle(); -+ if (run_udevsettle() != 0) -+ fprintf(stderr, "%s unable to avoid potential race with busy " -+ "device-mapper devices", UDEVSETTLE); - - r = 0; - |