/mandos/release : revision 237.7.82

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-hook

Committer: teddy at bsnet
Date: 2011-12-25 00:40:09 UTC
mto: (237.7.89 trunk) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 290.
Revision ID: teddy@fukt.bsnet.se-20111225004009-n5uimmac6h8djtv8

* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
  (add_argument): Added "nonnull" attribute on the "arg" argument.
  (add_environment): Added "nonnull" attribute on the "def" argument.
  (print_out_password, free_plugin): Added "nonnull" attribute.
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/mandos-client.c (perror_plus): Bug fix; restore errno
                                           after fprintf().
* plugins.d/password-prompt.c (fprintf_plus): New.
(conflict_detection/is_plymouth, main/parse_opt): Added "nonnull"
                                                   attribute.
(conflict_detection/is_plymouth, conflict_detection, main): Bug fix;
                                                             Call
                                                             error_plus()
                                                             instead
                                                             of
                                                             error().
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/plymouth.c (exec_and_wait): Added "nonnull" attribute on
                                        the "path" and "argv"
                                        arguments.
  (is_plymouth): Added "nonnull" attribute.

Show diffs side-by-side

added added

removed removed

initramfs-tools-hook

107

esac

108

done

109

110

# Get DEVICE from initramfs.conf and other files

111

. /etc/initramfs-tools/initramfs.conf

112

for conf in /etc/initramfs-tools/conf.d/*; do

113

if [ -n `basename \"$conf\" | grep '^[[:alnum:]][[:alnum:]\._-]*$' \

114

| grep -v '\.dpkg-.*$'` ]; then

115

[ -f ${conf} ] && . ${conf}

116

117

done

118

export DEVICE

119

110

120

# Copy network hooks

111

121

for hook in /etc/mandos/network-hooks.d/*; do

112

122

case "`basename \"$hook\"`" in

118

128

# Copy any files needed by the network hook

119

129

MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \

120

130

VERBOSITY=0 "$hook" files | while read file target; do

131

if [ ! -e "${file}" ]; then

132

echo "WARNING: file ${file} not found, requested by Mandos network hook '${hook##*/}'" >&2

133

121

134

if [ -z "${target}" ]; then

122

135

copy_exec "$file"

123

136

else

Older »