/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: 2008-09-04 12:38:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080904123835-hervuvv4pmpxl8r1
* README: Improved wording.

* initramfs-tools-hook: Do not copy auto-save files from
                        "/etc/mandos/plugins.d".  Do not create key
                        ring files.  Do not reset permissions on
                        things like "$DESTDIR/lib/mandos/plugins.d",
                        which should not be publicly accessible.

* plugin-runner.xml (DESCRIPTION, PLUGINS): Improved grammar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
74
74
for file in /etc/mandos/plugins.d/*; do
75
75
    base="`basename \"$file\"`"
76
76
    case "$base" in
77
 
        *~|.*|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
 
77
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
78
78
        *) copy_exec "$file" "${PLUGINDIR}";;
79
79
    esac
80
80
done
85
85
    copy_exec /usr/bin/gpg
86
86
fi
87
87
 
88
 
# Key files
 
88
# Key files and config files
89
89
for file in /etc/mandos/*; do
90
90
    if [ -d "$file" ]; then
91
91
        continue
92
92
    fi
93
93
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
94
94
done
95
 
# Create key ring files
96
 
gpg --no-random-seed-file --quiet --batch --no-tty \
97
 
    --no-default-keyring --no-options \
98
 
    --homedir "${DESTDIR}${CONFDIR}" --no-permission-warning \
99
 
    --import-options import-minimal \
100
 
    --import "${DESTDIR}${CONFDIR}/seckey.txt"
101
 
chown nobody "${DESTDIR}${CONFDIR}/secring.gpg"
102
95
 
103
96
# /lib/mandos/plugin-runner will drop priviliges, but needs access to
104
97
# its plugin directory and its config file.  However, since almost all
125
118
    chmod a+rX "${DESTDIR}$dir"
126
119
done
127
120
for dir in /lib /usr/lib; do
128
 
    chmod --recursive a+rX "${DESTDIR}$dir"
 
121
    find "${DESTDIR}$dir" \! -perm /u+rw,g+r -prune -o -print0 \
 
122
        | xargs --null chmod a+rX
129
123
done