summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-20 23:32:22 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-20 23:32:22 +0000
commitc4386b7f7ffb306ebea926abe52b998f1af1701f (patch)
tree439d8f2cdc8f0161588f9bd1b9f7fc5de2a5da06 /sys-fs/cryptsetup
parentMove net-misc/get-flash-videos to media-video/get_flash_videos (diff)
downloadhistorical-c4386b7f7ffb306ebea926abe52b998f1af1701f.tar.gz
historical-c4386b7f7ffb306ebea926abe52b998f1af1701f.tar.bz2
historical-c4386b7f7ffb306ebea926abe52b998f1af1701f.zip
Drop dead prompt code.
Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r--sys-fs/cryptsetup/ChangeLog5
-rw-r--r--sys-fs/cryptsetup/Manifest10
-rwxr-xr-xsys-fs/cryptsetup/files/dmcrypt.rc4
3 files changed, 10 insertions, 9 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index a6b95961f97c..8a4edf25e9a3 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/cryptsetup
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.120 2011/11/13 16:32:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.121 2011/11/20 23:32:22 vapier Exp $
+
+ 20 Nov 2011; Mike Frysinger <vapier@gentoo.org> files/dmcrypt.rc:
+ Drop dead prompt code.
13 Nov 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.1.ebuild:
Fix init.d typo #390381 by Helmut Jarausch.
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 19e21421d771..275f8457c2ca 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -10,7 +10,7 @@ AUX 1.1.0_rc3-static-no-selinux.patch 813 RMD160 a9e476edd9bfe12e4663962198e3ed2
AUX 1.1.3-dm-crypt-start.sh 8651 RMD160 618342317373f3a19f200addfb2e528ced25e9e3 SHA1 ea59b43866a7799d081d628eaed624323a6fa16c SHA256 1489ce5480d51beb81cf4f5178468ad4b2f2e4b3f53bc75ee8fe47d3e050a76a
AUX 1.1.3-dm-crypt-stop.sh 1272 RMD160 f91d025777670423d572018a08429805b828688f SHA1 c91e44f75231554c8129b7c3538eae2850ba67b9 SHA256 c81bf0cf8e57b3f83f55c808dba619b0a0f60eef8c3ed406d266be7cecdf96f9
AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
-AUX dmcrypt.rc 9093 RMD160 76f2434a62cac6ad3fa11f24fff26b72bc4a1f75 SHA1 c827ca8e7e8b1f090463b430aa6ead8c791fb80b SHA256 f63e7690e9f9aea0d36565dac4aff7614a2542d79d7c6ec99611faa34009d912
+AUX dmcrypt.rc 8954 RMD160 348e2c057a72c74dba992723497865d163b7dd06 SHA1 478c5337dee9f37040ff83df015236eb2fb554e4 SHA256 89b1540af9ce9cb29f95d3ac80986c4fdae5aea6d06b39210557ec3c3da9ab90
DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
@@ -21,12 +21,12 @@ EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e1
EBUILD cryptsetup-1.1.3-r3.ebuild 3364 RMD160 a4e497ae62cc974350460446b173fb3d092afc28 SHA1 e640b856ab39e456ed194da62fe0cf0dc11d76ab SHA256 54733ac01c0e2ec02c02ec6f13e50a24452cf1d7c93135a5bf8141129687ab52
EBUILD cryptsetup-1.2.0-r1.ebuild 3628 RMD160 98044dce88847e72e1778482bef3ddcc600bae52 SHA1 60a007d06de6b05f78f03b9a4488ca9b463aa446 SHA256 0dff751d075bb47c26c9dd3426f86da7e8e717b08a5daa7dfd05affc509e0b6e
EBUILD cryptsetup-1.4.1.ebuild 3338 RMD160 44b857d78826b355f15ad864c293530a075bd9ae SHA1 a861ee9e83966fba2df6bd0d6a0d4d3a128ba510 SHA256 8764688bdd4674d3a6adaff02e1acd70d719ba66a445c306da32eaa5836226dc
-MISC ChangeLog 17846 RMD160 ea70018a7d02f7b4444113735bc0a3973ee35f6a SHA1 7e1fb58e8829bc0d9922819e7cd8f4d805074aef SHA256 6458d348cf2bf6f0a3d4af040d9ac9f982e000393f0de0aefb49412c87449334
+MISC ChangeLog 17940 RMD160 17a937ad0de2bb18bea5861a0c310da606f61a65 SHA1 1f4bee329d94ace4267a4225d375b1972285397a SHA256 6d8d670a274fad3df4a1379c12da79e77b2f947f3424265b1a5bc75f426354f8
MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6/8Q4ACgkQaC/OocHi7JbXigEAoUFlHH1QugucRj9kCfGDQsL6
-S9P+ATzejdQogS5YbygA/2d5jR/Cs8EnQrzT0oo+E18D5cbAyG4cyqMiHW7Fy1D/
-=2eGl
+iF4EAREIAAYFAk7JjgwACgkQaC/OocHi7JYg4gEAjeEtcMu48HpJdImkcCu+6MeI
+i9ScDOcC3ieepJcaeHQA/2phACvxOfmnYrzlejmtEUxqGfgXYjHkYCQtyd3GaL7w
+=9NXx
-----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/files/dmcrypt.rc b/sys-fs/cryptsetup/files/dmcrypt.rc
index 07ccd84b23af..738e56386e8e 100755
--- a/sys-fs/cryptsetup/files/dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/dmcrypt.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.1 2011/11/13 04:18:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.2 2011/11/20 23:32:22 vapier Exp $
depend() {
before checkfs fsck
@@ -71,9 +71,7 @@ dm_crypt_execute_dmcrypt() {
if [ -n "${key}" ] ; then
read_abort() {
# some colors
- local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
local ans
- local prompt=" ${green}*${off} $1? (${red}yes${off}/${green}No${off}) "
shift
[ -z "${NORMAL}" ] && eval $(eval_ecolors)
einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "