projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
396df49
)
Adjusting whitespace to tabs on components/9990-misc-helpers.sh
author
Richard Nelson
<unixabg@gmail.com>
Tue, 23 Jun 2015 20:46:13 +0000
(15:46 -0500)
committer
Daniel Baumann
<mail@daniel-baumann.ch>
Wed, 19 Aug 2015 15:22:23 +0000
(17:22 +0200)
components/9990-misc-helpers.sh
patch
|
blob
|
history
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
9318a4b
..
943e73b
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-114,7
+114,7
@@
check_dev ()
ISO_DEVICE=$(dirname ${ISO_DEVICE})
[ -b "$ISO_DEVICE" ] && break
i=$(($i -1))
ISO_DEVICE=$(dirname ${ISO_DEVICE})
[ -b "$ISO_DEVICE" ] && break
i=$(($i -1))
- done
+ done
fi
if [ "$ISO_DEVICE" = "/" ]
fi
if [ "$ISO_DEVICE" = "/" ]
@@
-1074,18
+1074,18
@@
find_persistence_media ()
result=$(probe_for_file_name "${overlays}" ${dev})
if [ -n "${result}" ]
then
result=$(probe_for_file_name "${overlays}" ${dev})
if [ -n "${result}" ]
then
- local loopdevice
+ local loopdevice
loopdevice=${result##*=}
loopdevice=${result##*=}
- if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
+ if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice}
then
then
- local luksfile
+ local luksfile
luksfile=""
if luksfile=$(open_luks_device "${loopdevice}")
then
luksfile=""
if luksfile=$(open_luks_device "${loopdevice}")
then
- result=${result%%=*}
+ result=${result%%=*}
result="${result}=${luksfile}"
else
result="${result}=${luksfile}"
else
- losetup -d $loopdevice
+ losetup -d $loopdevice
result=""
fi
fi
result=""
fi
fi