/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-22 09:07:34 UTC
  • mfrom: (347 release)
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 348.
  • Revision ID: teddy@recompile.se-20160622090734-66ryti9rt6167sru
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-script
94
94
# If we are connecting directly, run "configure_networking" (from
95
95
# /scripts/functions); it needs IPOPTS and DEVICE
96
96
if [ "${connect+set}" = set ]; then
 
97
    set +e                      # Required by library functions
97
98
    configure_networking
 
99
    set -e
98
100
    if [ -n "$connect" ]; then
99
101
        cat <<-EOF >>/conf/conf.d/mandos/plugin-runner.conf
100
102
        
108
110
 
109
111
# Our keyscript
110
112
mandos=/lib/mandos/plugin-runner
 
113
test -x "$mandos"
111
114
 
112
115
# parse /conf/conf.d/cryptroot.  Format:
113
116
# target=sda2_crypt,source=/dev/sda2,key=none,keyscript=/foo/bar/baz