summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Lau2017-09-06 10:35:35 +0200
committerSebastian Lau2017-09-06 10:35:35 +0200
commit3f7e30ce4a776e13c2046480068936e80acd8e96 (patch)
tree269b732a194c7f0fc5698ead058350a3b6170d83
parent418a1dce301b6ac1b3a977fc9b6714ba088772ed (diff)
downloadaur-3f7e30ce4a77.tar.gz
Alter plymouth.encrypt_hook to use resolved device
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--plymouth.encrypt_hook2
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54f1899fd053..5c72cff17b94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Aug 17 11:11:16 UTC 2017
+# Wed Sep 6 08:35:05 UTC 2017
pkgbase = plymouth
pkgdesc = A graphical boot splash screen with kernel mode-setting support
pkgver = 0.9.3
- pkgrel = 1
+ pkgrel = 2
url = http://www.freedesktop.org/wiki/Software/Plymouth/
arch = i686
arch = x86_64
@@ -38,7 +38,7 @@ pkgbase = plymouth
source = plymouth-update-initrd.patch
md5sums = b261c720888a5431cdfce8494805eab3
md5sums = 65fa2763d5c9bb9f80973ea5e6e3db3e
- md5sums = fbdd5d04e3089a214b9056357434df86
+ md5sums = d67132b297ccfb1a877a2efd78076963
md5sums = 65eb269910f1b81e3f0970af456394ca
md5sums = ae6e97bb1104bb12cbca6738e3fb872d
md5sums = 1430ae2ec501d600f8f6771454dc9bbe
diff --git a/PKGBUILD b/PKGBUILD
index 78435975fc11..e8acb0278ab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=plymouth
pkgver=0.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="A graphical boot splash screen with kernel mode-setting support"
url="http://www.freedesktop.org/wiki/Software/Plymouth/"
@@ -44,7 +44,7 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk
md5sums=('b261c720888a5431cdfce8494805eab3'
'65fa2763d5c9bb9f80973ea5e6e3db3e'
- 'fbdd5d04e3089a214b9056357434df86'
+ 'd67132b297ccfb1a877a2efd78076963'
'65eb269910f1b81e3f0970af456394ca'
'ae6e97bb1104bb12cbca6738e3fb872d'
'1430ae2ec501d600f8f6771454dc9bbe'
diff --git a/plymouth.encrypt_hook b/plymouth.encrypt_hook
index 963cc06e7b45..a623debf54a6 100644
--- a/plymouth.encrypt_hook
+++ b/plymouth.encrypt_hook
@@ -76,7 +76,7 @@ EOF
if [ ${dopassphrase} -gt 0 ]; then
echo
echo "A password is required to access the ${cryptname} volume:"
- plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}"
+ plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}"
sleep 2
fi
if [ -e "/dev/mapper/${cryptname}" ]; then