/mandos/trunk

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

« back to all changes in this revision

Viewing changes to initramfs-tools-hook

  • Committer: Teddy Hogeborn
  • Date: 2017-09-03 09:06:09 UTC
  • Revision ID: teddy@recompile.se-20170903090609-y6vqe6bpaedeeyvu
Plymouth plugin: Try the newest PID file location

* plugins.d/plymouth.c (plymouth_old_pid): Rename to
  "plymouth_old_old_pid".
  (plymouth_pid): Rename to "plymouth_old_pid".
  (plymouth_pid): New.
  (get_pid): Also check plymouth_old_old_pid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
142
142
for conf in /etc/initramfs-tools/conf.d/*; do
143
143
    if [ -n `basename \"$conf\" | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
144
144
        | grep -v '\.dpkg-.*$'` ]; then
145
 
        [ -f ${conf} ] && . ${conf}
 
145
        [ -f "${conf}" ] && . "${conf}"
146
146
    fi
147
147
done
148
148
export DEVICE
157
157
    if [ -x "$hook" ]; then
158
158
        # Copy any files needed by the network hook
159
159
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
160
 
            VERBOSITY=0 "$hook" files | while read file target; do
 
160
            VERBOSITY=0 "$hook" files | while read -r file target; do
161
161
            if [ ! -e "${file}" ]; then
162
162
                echo "WARNING: file ${file} not found, requested by Mandos network hook '${hook##*/}'" >&2
163
163
            fi
169
169
        done
170
170
        # Copy and load any modules needed by the network hook
171
171
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
172
 
            VERBOSITY=0 "$hook" modules | while read module; do
173
 
            if [ -z "${target}" ]; then
174
 
                force_load "$module"
175
 
            fi
 
172
            VERBOSITY=0 "$hook" modules | while read -r module; do
 
173
            force_load "$module"
176
174
        done
177
175
    fi
178
176
done