From 1b2585481fe8b918c224ea4976ff19990f3d7850 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 12 Apr 2015 21:27:45 +0000 Subject: [PATCH] Delete old dm_crypt_execute_localmount hook as no one uses it anymore #321507 by forums. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- sys-fs/cryptsetup/ChangeLog | 6 +++- sys-fs/cryptsetup/Manifest | 30 +++++++++--------- sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc | 40 +++--------------------- 3 files changed, 25 insertions(+), 51 deletions(-) diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index b6c1c2f6baa7..7cad6c7cc38f 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,10 @@ # 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.203 2015/04/12 20:40:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.204 2015/04/12 21:27:43 vapier Exp $ + + 12 Apr 2015; Mike Frysinger files/1.5.1-dmcrypt.rc: + Delete old dm_crypt_execute_localmount hook as no one uses it anymore #321507 + by forums. 12 Apr 2015; Mike Frysinger files/1.5.1-dmcrypt.rc: Run ebegin message through eval so the output is expanded #442374 by Toralf diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index c1c807170603..b694f55fa8f9 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -2,7 +2,7 @@ Hash: SHA256 AUX 1.0.6-dmcrypt.confd 3384 SHA256 751ec65383fdd19dae0eee4155ec4df9b2ddb3ebe97d32094eaabe20ac6e1a06 SHA512 060fa4b0e30a1b9532bc53785524a8605f232b52c4385ed631e9a4728c01dfcf4d6c88af003e10d22cb7f9769def8be4780e4093251e5a46dbbba784f18fbe4d WHIRLPOOL 1d4c47ced438829fd94df07264cf9588117b73be76dcac5ac0904218d5be6383a36867132324a5a50e92e70626f5cc2c72a065fb89f29324af5772214f526ff1 -AUX 1.5.1-dmcrypt.rc 9522 SHA256 e185181cd1fd50cd8925ffb093ce2426a225a9bb6c622f1c4380bd28571d54d2 SHA512 79b26763c6cb72f87b8259a40be16b65a75ec730c0730802a479b54e55af51e62e63919f4a61e27e11168127e0a0964c81938b994452b2a77eb64089f50d19d7 WHIRLPOOL 7c0f8dff93a7edee40e73d4336412a02dc5f0c003c99222c0e3fa2517d48946e77e92d521e72dea9103b4e76d5412908617163ad339c90fc0a59d7ef41983ac5 +AUX 1.5.1-dmcrypt.rc 8665 SHA256 cd27c6b5e7c661f0507236b7a1252396f8b28df1764dc60c913a7eed52061bad SHA512 470215f76f3475a4ae2656b6e80a7370e53426f397025204d940db321a47970c13da2a08ca0c7044072321dc736867dba08598893f7b38e7fa3677bca9199152 WHIRLPOOL 601e2e424eda19c0082f9029788ec5b470f2a5bed2da998051a59889f80da4617a35779f95ca1c316e732304ca2c14c941934f49521b14e47eca63f40bd3f4fc 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 31282 SHA256 97477dbafc3c3546e6708a4ada2b159c9d8d0e9c3eb1c6b5f67e2b9af6b4e5b5 SHA512 48a5494d6adcea4333cc34dcafdb76958a578e79048b9ccf616fa5bb98db0b4fe3bbe591d3735866e2fb304b4b31b1542c9f7626c2b8379b1d9f8b1f49eee379 WHIRLPOOL b4be0a0d4eaf8eb7b073e962997e86fdc075a0e8877f17d632ebcda30995096518bbdb109e41cd00317e105ed741995689bfe1c810702f01c66ae5bb1b2805c0 +MISC ChangeLog 31450 SHA256 62d07ae3b1ec1abd2de5e134de32ba8d400d69c5f8368cc5bd2d4fb7bb1de04b SHA512 c6120dbc9db6d7ab6a21fb0e685c2ac013de334de43865b1c2076930af695a74b9fee30882b0ac4135db4a54132b28e378baf17aa28dc2e7fe95c37208ac4a04 WHIRLPOOL ea0b0ce2e54c4885c89e74f50c4f0875646919d64fc1d4a3e3146257211c42dec5f35c0d792516d15d4dbccf7b4bca0c34c272bb61fce3e91256db11f047f213 MISC metadata.xml 803 SHA256 ce0f5ae709246410b10cad5d04e7ebeb228009bbb3259f0e79aa693e35ff96d3 SHA512 332aa6594bfa3f07a321dd37d9c0787d7d93c77e6a380afe4793a125a58f20bde092410bb91be68e39616dc4933d9fb375ac5576c8d85c802d0227c995ae24e7 WHIRLPOOL 4811a0bc88bcf22d45de33352c85f7f6dc221d19c6cd6fe47072110dcf6e2cd0522abec94fbed99aff5be06e7ae1e4d6dcca33e20ec0b859735da2ef65e0b7a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVKthJAAoJEPGu1DbS6WIAGnAP+QEH6BsMajw3gp5NEgJkaFvW -LZxutWJ7cU8d1qdWH3z8NvxdujjhyZorUsNviQwr3yqfzaXAei85weFcptVfu6tJ -hNtyjmwNeYl8M8fs9mGO2mxk6MTj2eX7Yw0cWMV9qFAIrjOjGxrH7VgmTxhi4A4R -7434yRfuDyjzGGLCqV3RFQh0BLdYT+mU40RM4L6jwNtIow9CUXcvECpWrToniqZq -cZLZAfIVDIRivzGg9aEvQ0DbeYeGWHCUhJoTBUMjhURS0iHKBMp2z//4YgTis2V0 -3Lkp3xSnK1stXmwBVDtmRlWgqbkNC9/GoEJq0qPnsEwk5BoRLb6Cb9OHytGfKA4m -mejGCe2C/MNmo3JZoB3mCLzZMh+QpbHY294Jtl1Xcdf15tAe9ysOX9Age+Z+h5S+ -UkUNlRkn+Wu9Z6erR6ORyf1UaGf9j2VHnimCeovtZJTMyZ4S2Yl1Ig8FL20Bj1Bh -Bpbkk2TNOB3KNZBqMBMvuhrv+4qWp4DwPW8UEMIOiTBrTwhxBiCMk6MAbWs0BDf5 -mIPivj4H00McVXQz0Rj6spMgpazAvZTUmfzyh8QDjEcbTTeXRYvsit94UL60BIRR -YeQ7lH3EU7u8M3LB+b1c14zJ/FLGAI7E8qCzpa2MJolwpUO6OrVzzzcEaG/WC+wA -SWNdwZYmu2e3+3RrGfHJ -=cs2t +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 -----END PGP SIGNATURE----- diff --git a/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc index d5662ed6fdb5..d82157ae3574 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.6 2015/04/12 20:40:40 vapier Exp $ +# $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 $ depend() { before checkfs fsck @@ -12,9 +12,6 @@ depend() { } # We support multiple dmcrypt instances based on $SVCNAME -execute_hook="dm_crypt_execute_dmcrypt" -# XXX: Should we drop this ? -# execute_hook="dm_crypt_execute_localmount" conf_file="/etc/conf.d/${SVCNAME}" # Get splash helpers if available. @@ -24,7 +21,7 @@ fi # Setup mappings for an individual target/swap # Note: This relies on variables localized in the main body below. -dm_crypt_execute_dmcrypt() { +dm_crypt_execute() { local dev ret mode foo if [ -n "${target}" ] ; then @@ -210,33 +207,6 @@ dm_crypt_execute_dmcrypt() { fi } -# Run any post_mount commands for an individual mount -# -# Note: This relies on variables localized in the main body below. -dm_crypt_execute_localmount() { - local mount_point - - [ -z "${target}" ] && [ -z "${post_mount}" ] && return - - if ! cryptsetup status ${target} | egrep -q '\/dev/null - eend $? || cryptfs_status=1 - fi -} - # Lookup optional bootparams get_bootparam_val() { # We're given something like: @@ -281,7 +251,7 @@ start() { case ${targetline} in target=*|swap=*) # If we have a target queued up, then execute it - ${execute_hook} + dm_crypt_execute # Prepare for the next target/swap by resetting variables unset gpg_options key loop_file target options pre_mount post_mount source swap remdev @@ -304,12 +274,12 @@ start() { ;; esac - # Queue this setting for the next call to dm_crypt_execute_xxx + # Queue this setting for the next call to dm_crypt_execute eval "${targetline}" done 3< ${conf_file} # If we have a target queued up, then execute it - ${execute_hook} + dm_crypt_execute ewend ${cryptfs_status} "Failed to setup dm-crypt devices" } -- 2.26.2