/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to initramfs-tools-script

  • Committer: Teddy Hogeborn
  • Date: 2016-06-21 19:22:26 UTC
  • mfrom: (237.7.401 trunk)
  • Revision ID: teddy@recompile.se-20160621192226-yvrxurc8e2ur913y
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
57
57
# Get DEVICE from /conf/initramfs.conf and other files
58
58
. /conf/initramfs.conf
59
59
for conf in /conf/conf.d/*; do
60
 
    [ -f "${conf}" ] && . "${conf}"
 
60
    [ -f ${conf} ] && . ${conf}
61
61
done
62
62
if [ -e /conf/param.conf ]; then
63
63
    . /conf/param.conf
115
115
# parse /conf/conf.d/cryptroot.  Format:
116
116
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz
117
117
exec 3>/conf/conf.d/cryptroot.mandos
118
 
while read -r options; do
 
118
while read options; do
119
119
    newopts=""
120
120
    # Split option line on commas
121
121
    old_ifs="$IFS"