aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2010-02-21 21:21:48 +0200
committerBill Nottingham <notting@redhat.com>2011-02-28 15:31:44 -0500
commit5212d0a596d67bbd2f5effdd3686c123f778078f (patch)
tree78f41b7fd9ed97f6326a61c7da25f0b9fabec0df /rc.d/init.d
parent681717364c786083356ebe5d92c4cc6fd73af307 (diff)
downloadinitscripts-5212d0a596d67bbd2f5effdd3686c123f778078f.tar
initscripts-5212d0a596d67bbd2f5effdd3686c123f778078f.tar.gz
initscripts-5212d0a596d67bbd2f5effdd3686c123f778078f.tar.bz2
initscripts-5212d0a596d67bbd2f5effdd3686c123f778078f.tar.xz
initscripts-5212d0a596d67bbd2f5effdd3686c123f778078f.zip
Drop some unnecessary command invocations.
Diffstat (limited to 'rc.d/init.d')
-rw-r--r--rc.d/init.d/functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 3eddf1ea..63d1190e 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -671,7 +671,7 @@ find_crypto_mount_point() {
# Because of a chicken/egg problem, init_crypto must be run twice. /var may be
# encrypted but /var/lib/random-seed is needed to initialize swap.
init_crypto() {
- local have_random dst src key opt mode owner params makeswap skip arg opt
+ local have_random dst src key opt lsl owner params makeswap skip arg opt
local param value rc ret mke2fs mdir prompt mount_point
ret=0
@@ -686,8 +686,8 @@ init_crypto() {
if test -e "$key" ; then
owner=$(ls -l $key | (read a b owner rest; echo $owner))
if ! key_is_random "$key"; then
- mode=$(ls -l "$key" | cut -c 5-10)
- if [ "$mode" != "------" ]; then
+ lsl=$(ls -l "$key")
+ if [ "${lsl:4:6}" != "------" ]; then
echo $"INSECURE MODE FOR $key"
fi
fi