* [PATCH] crypt: Skip /etc/crypttab if not present
@ 2013-07-25 21:28 Amadeusz Żołnowski
[not found] ` <1374787724-27608-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Amadeusz Żołnowski @ 2013-07-25 21:28 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: Amadeusz Żołnowski
Prevents following error message:
I: *** Including module: crypt ***
/usr/lib/dracut/modules.d/90crypt/module-setup.sh: line 31: /etc/crypttab: No such file or directory
---
modules.d/90crypt/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index 639a77f..6b32b6a 100755
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -57,7 +57,7 @@ install() {
inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
fi
- if [[ $hostonly ]]; then
+ if [[ $hostonly ]] && [[ -f /etc/cryptab ]]; then
# filter /etc/crypttab for the devices we need
while read _mapper _dev _rest; do
[[ $_mapper = \#* ]] && continue
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] crypt: Skip /etc/crypttab if not present
[not found] ` <1374787724-27608-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
@ 2013-07-31 14:02 ` Harald Hoyer
[not found] ` <51F918F8.7080201-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Harald Hoyer @ 2013-07-31 14:02 UTC (permalink / raw)
To: Amadeusz Żołnowski; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
On 07/25/2013 11:28 PM, Amadeusz Żołnowski wrote:
> Prevents following error message:
>
> I: *** Including module: crypt ***
> /usr/lib/dracut/modules.d/90crypt/module-setup.sh: line 31: /etc/crypttab: No such file or directory
> ---
> modules.d/90crypt/module-setup.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
> index 639a77f..6b32b6a 100755
> --- a/modules.d/90crypt/module-setup.sh
> +++ b/modules.d/90crypt/module-setup.sh
> @@ -57,7 +57,7 @@ install() {
> inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
> fi
>
> - if [[ $hostonly ]]; then
> + if [[ $hostonly ]] && [[ -f /etc/cryptab ]]; then
> # filter /etc/crypttab for the devices we need
> while read _mapper _dev _rest; do
> [[ $_mapper = \#* ]] && continue
>
pushed, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] crypt: Fix typo--/etc/crypttab not /etc/cryptab
[not found] ` <51F918F8.7080201-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2013-08-06 15:25 ` James Lee
0 siblings, 0 replies; 3+ messages in thread
From: James Lee @ 2013-08-06 15:25 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA; +Cc: James Lee
1ae8b8a breaks the crypt module for those who use keyfiles due to a
typo leading to the exclusion of /etc/crypttab from the initrd.
---
modules.d/90crypt/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
index 6b32b6a..31e0e5f 100755
--- a/modules.d/90crypt/module-setup.sh
+++ b/modules.d/90crypt/module-setup.sh
@@ -57,7 +57,7 @@ install() {
inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
fi
- if [[ $hostonly ]] && [[ -f /etc/cryptab ]]; then
+ if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
# filter /etc/crypttab for the devices we need
while read _mapper _dev _rest; do
[[ $_mapper = \#* ]] && continue
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-06 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-25 21:28 [PATCH] crypt: Skip /etc/crypttab if not present Amadeusz Żołnowski
[not found] ` <1374787724-27608-1-git-send-email-aidecoe-2qtfh70TtYba5EbDDlwbIw@public.gmane.org>
2013-07-31 14:02 ` Harald Hoyer
[not found] ` <51F918F8.7080201-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-08-06 15:25 ` [PATCH] crypt: Fix typo--/etc/crypttab not /etc/cryptab James Lee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox