Use blkid -t to look up devices via tag values (like UUID/PARTUUID) #525524 by tokiclover.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 32 insertions, 23 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 7cad6c7cc38f..fc289956bc0a 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.204 2015/04/12 21:27:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.205 2015/04/12 21:44:38 vapier Exp $
+
+  12 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/1.0.6-dmcrypt.confd,
+  files/1.5.1-dmcrypt.rc:
+  Use blkid -t to look up devices via tag values (like UUID/PARTUUID) #525524 by
+  tokiclover.
 
   12 Apr 2015; Mike Frysinger <vapier@gentoo.org> files/1.5.1-dmcrypt.rc:
   Delete old dm_crypt_execute_localmount hook as no one uses it anymore #321507
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index b694f55fa8f9..3798051fc42b 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0.6-dmcrypt.confd 3384 SHA256 751ec65383fdd19dae0eee4155ec4df9b2ddb3ebe97d32094eaabe20ac6e1a06 SHA512 060fa4b0e30a1b9532bc53785524a8605f232b52c4385ed631e9a4728c01dfcf4d6c88af003e10d22cb7f9769def8be4780e4093251e5a46dbbba784f18fbe4d WHIRLPOOL 1d4c47ced438829fd94df07264cf9588117b73be76dcac5ac0904218d5be6383a36867132324a5a50e92e70626f5cc2c72a065fb89f29324af5772214f526ff1
-AUX 1.5.1-dmcrypt.rc 8665 SHA256 cd27c6b5e7c661f0507236b7a1252396f8b28df1764dc60c913a7eed52061bad SHA512 470215f76f3475a4ae2656b6e80a7370e53426f397025204d940db321a47970c13da2a08ca0c7044072321dc736867dba08598893f7b38e7fa3677bca9199152 WHIRLPOOL 601e2e424eda19c0082f9029788ec5b470f2a5bed2da998051a59889f80da4617a35779f95ca1c316e732304ca2c14c941934f49521b14e47eca63f40bd3f4fc
+AUX 1.0.6-dmcrypt.confd 3628 SHA256 0f64c6e19f0bec777ba7251a1156c2e369cf62d6eaccb5a259d909b03f8e4a9e SHA512 1d79f8342f0425ede08973b259c7daf723ed392399a36be2498cd64ef4de074e2ade035245bf9fc34e9a3b1972091e06b686c2b2ea4e8d5116476697e0991c8b WHIRLPOOL 42ef531495893aa7782625b943a885edd96ae32806aa9090e49b2e20f7aabec75f4012eb5580584cd58c309c44f0b3a1aaae3e8da8171d4b0ea1bb414d19863f
+AUX 1.5.1-dmcrypt.rc 8637 SHA256 99852adc78259ae7d59ea28efd591419b477a2c55ee01066582b7ad95fe65d55 SHA512 91ccb745e74575fc92e1c4c3218b2c724254041e5bc235c4c647857a589384d0b73b266decea87c86b2e4081d17ed1d9085102b6fb96cc48948b089f1d8f109b WHIRLPOOL 8f9759218fb860983a0c95afd469738b0b0d13fe65fe230846d8514ac36d43ceaccb03260cf395bf31d36a034585df66b420d45d5e0420324afcac9446252976
 AUX cryptsetup-1.6.1-openssl-static.patch 472 SHA256 7029ba7870ff183b7dac3c658140c8c01286efd29e9427d1195b5b4e85fe2f4f SHA512 4292ee661b3e1a26b3c9b6fe8f360ed1df1cb416a13162ffa40d6610d5d0431c3dbdb17280fb1aa3aa6eeacb735ead3da4e6cc126d8be74121565b4c9bf6c6a2 WHIRLPOOL f0186cf9317560a480dab53c8c538f35ba5273401f2d37b4be9e3aae06203c43fcd22c4ce17c41cf80a01db5cd22877105ff2be0a8f3effd50cde8c9f42b68df
 DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
@@ -10,22 +10,22 @@ DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14
 EBUILD cryptsetup-1.6.2.ebuild 4322 SHA256 13c975deec6ae9b7801da12e379548c7569c88cdab3bd893144cfe5cac1073fd SHA512 4cf354a17f640899bc63745c7af9ff9572cbc4adf791c00b6bc51469c1c9750731eb504be35df7db50c2646a665442c47c6101f4e2486f64e162121c5645c88c WHIRLPOOL ef3d10184827e39d4662f55137c93fd2f466f29f9dbdbcdd1eac5da2c12ac5328f0ffea833ff18d6f3cbc01b78e9f5d9d4d17006a44a75902837c4a8f90cdf32
 EBUILD cryptsetup-1.6.5.ebuild 4485 SHA256 6f646bbf6096079726e477872a80b07bd96604cb224251dd4497c7eaace15161 SHA512 8101c36d38503d5b333fa3efa7d4dae8bf9edd2241f679eb1b17a0b2bb70e4d83373a24de2c6d4b16a73ee7da6882c2e5ae6eb8b29560666e753347ebeda1906 WHIRLPOOL 790f6bce1f49c83c0cbc9f486eb4331a3897bfaaa80e11dc5ea8604f5fac121defc5eb35b9cf5111d7753fa81c61290d37fde14111c950d4a19e96c9ab760b50
 EBUILD cryptsetup-1.6.6.ebuild 4817 SHA256 2f4a66ec18e6d5fc5033d7fef2c126403ed395a49023263b8f8fea361d8039a9 SHA512 7c505f30ad17ca003d88ddf0aa7d2c395476a9d1521214ce858a48a9b48f52b81d6ea8647ab75f8336d2da811b1bd3a36dbe0764e397466bda8f4eb67606e574 WHIRLPOOL 029900d0fea6cde671e433bd4237c379e1be549fc1236d4ff847926419e47bbd582d86a96dca1701f1a5cc0b7a16b34172f137f7c716204cce7919f98f11e6a4
-MISC ChangeLog 31450 SHA256 62d07ae3b1ec1abd2de5e134de32ba8d400d69c5f8368cc5bd2d4fb7bb1de04b SHA512 c6120dbc9db6d7ab6a21fb0e685c2ac013de334de43865b1c2076930af695a74b9fee30882b0ac4135db4a54132b28e378baf17aa28dc2e7fe95c37208ac4a04 WHIRLPOOL ea0b0ce2e54c4885c89e74f50c4f0875646919d64fc1d4a3e3146257211c42dec5f35c0d792516d15d4dbccf7b4bca0c34c272bb61fce3e91256db11f047f213
+MISC ChangeLog 31649 SHA256 5763ed6eaec4ad2857d8ef96d0143bfcfc2d45e33299ef96ce0be19b964976d5 SHA512 0b44e24f742e12a89d36427da0c37e648e00e1afa44cd29c7dcc090f158de5888cd9d58c6e121b08c72add52c04cc6e1fedc05a324824c9b44c4482f815070b2 WHIRLPOOL 7d634a647d3db5c71fbb00e34e0400a3e2f73bb9f99b75b6af45ee346cbb48243af33065709eed22afd74830db2ff3de53e147e4c5397530f262a9fcd536f0b4
 MISC metadata.xml 803 SHA256 ce0f5ae709246410b10cad5d04e7ebeb228009bbb3259f0e79aa693e35ff96d3 SHA512 332aa6594bfa3f07a321dd37d9c0787d7d93c77e6a380afe4793a125a58f20bde092410bb91be68e39616dc4933d9fb375ac5576c8d85c802d0227c995ae24e7 WHIRLPOOL 4811a0bc88bcf22d45de33352c85f7f6dc221d19c6cd6fe47072110dcf6e2cd0522abec94fbed99aff5be06e7ae1e4d6dcca33e20ec0b859735da2ef65e0b7a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKuNQAAoJEPGu1DbS6WIAPWkP/2EMuffxw3Jl7oT74JzJOJdQ
-sF6szZKPe65nJY9CH+Q9KrnFwOLW98qvA8J5jIqV6dfn+RVEQxwKmGGoacr+rYHS
-agDEh9wio7d2Q+YgP2Im2ObPUyVGMxAfLpcTbYFbTeUP6SYJDI4oL2kMmRo6FSVw
-faUTKwaaWQR/9SSNtTAkdWCiwCazYNClldaVPK8zrrGs4KXkEypPCVaIPs0Dl9/Q
-ZtGbRvsBAYPuPEAgULIqqw+CBivFaDAJw9NPN798WZziywWmYBIL+slNwONr4Bo/
-fj+z4NfNinO7/7blqgWT5G5eMugO6wiiQDF/ovb+QR0QePbSBZ1tQ2WRpwyQS/wQ
-YvVyMkn7wWTwwAykyJVhKjhWxR1SuF+uoLolBMYyceZm9f4Lr5JenMNNL7bifAHo
-FigW4u6Xhyvhm7hjNI8lIsR0WQmJ1SkrjQg+m759rSJjforGI2OTXsAgveHeUAoC
-Db8dqOGKQD1P9AOPLkXNtgh5YRtDCjBXs8GG3xcT4JusZCRD+nDcD5Que/5v6vFC
-D0Bk4193MzUZcZiZJQ6VJvDh0ecBtEvPfE+rE3ZcjjfhCEEOo0NTnRJO3VDADmoT
-oBM5QD4fP6nOg8Z7JDF6ICLn5/Y9xanO+SmSJLRx+Dk20FE4CHzwnhavaHI7GkB1
-xAVX6WEYfJwhkX0+5GSL
-=SNeP
+iQIcBAEBCAAGBQJVKudHAAoJEPGu1DbS6WIAt30P/0/ZIxdK4iH7fFDO9j+2C30F
+8c+SVwUDk1RwLHKuhNXQXrGEZ4ym+ZHZ/DNMHDUybeUrkA/IIUQ1w+Sj2pnGyKCJ
+3F3HuvHRWsPfhCNtxiVlXC1o2MXDglPqH8bJHz/33LFLOV4Id8XZKOBErKjk1z6O
+znFzHEfy3OU+aQAkGZUSZcNG2yUwtZ0jd9Y16WnxVSpl4vV67FpHvsQmZTBssvVW
+NcaN2wyVSDK3+WO0fkuWA1h6eUmRUeJpVstKCkqhi28LWTvzIiPCbjhkCjLfRmkr
+I4M6kpqIqwCkC/FnFnqahk8vAomeG5znnJKn9cVi4e2ZwGaGlTljE2Mw+MaxWAYw
+xsMwMaE1Uib6+yiF1+pD9ReSOpKrRrz7T5eGqWbiufwBIWT+F2nHs+EF4dIinFyI
+AT0mbEmGxQOWi5JzPKnnDK9SxmeUh/R0AK0d8Hf57f46vIBHDaEDevGNSmoPHSWz
+g29d4zkJIlavy3KQBAsBdRREghgjwehiY/9w0rg6QVxUEDneURfw3baWPZngBJZn
+Gf/d6Q3Q2fD3iSvW3qKXPB1ryp1z3tOfatWfQngbFXEOECaA5UjpYbgFlx5aoE6n
+oA1lCoFAJlV7PNo0n9L4TzLgCFuxc0pCKHYcUzsVCf5ZJziZY0YObKwqlejct+22
++cIveExnccL08sDm+3IK
+=zCY6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd b/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
index eef33596ab72..630d3bf274c3 100644
--- a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
+++ b/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
@@ -34,6 +34,9 @@
 # target=<name>                      == Mapping name for partition.
 # swap=<name>                        == Mapping name for swap partition.
 # source='<dev>'                     == Real device for partition.
+#                                    Note: You can (and should) specify a tag like UUID
+#                                    for blkid (see -t option).  This is safer than using
+#                                    the full path to the device.
 # key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
 # remdev='<dev>'                     == Device that will be assigned to removable media.
 # gpg_options='<opts>'               == Default are --quiet --decrypt
diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
index d82157ae3574..cca41f598559 100755
--- a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.7 2015/04/12 21:27:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.8 2015/04/12 21:44:38 vapier Exp $
 
 depend() {
 	before checkfs fsck
@@ -40,11 +40,12 @@ dm_crypt_execute() {
 	else
 		return
 	fi
-	if [ "x${source#UUID}" != "x${source}" ]; then
-		source=${source#UUID=}
-		source="$(blkid -U ${source})"
-	fi
-	if [ -z "${source}" ] && [ ! -e "${source}" ] ; then
+	case ${source} in
+	*=*)
+		source=$(blkid -l -t "${source}" -o device)
+		;;
+	esac
+	if [ -z "${source}" ] || [ ! -e "${source}" ] ; then
 		ewarn "source \"${source}\" for ${target} missing, skipping..."
 		return
 	fi