/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: 2019-03-30 21:23:59 UTC
  • Revision ID: teddy@recompile.se-20190330212359-z7u9ik1lh5auybhm
mandos-ctl: Refactor: fix confusion about values_to_set/values_to_get

* mandos-ctl (TestPropertySetterCmd.runTest): Generalize to work on
                                              any command regardless
                                              of what combination of
                                              values_to_set or
                                              values_to_get attributes
                                              it has.
  (TestPropertySetterCmd.run_command): Remove.
  (TestEnableCmd, TestDisableCmd, TestBumpTimeoutCmd,
  TestStartCheckerCmd, TestStopCheckerCmd, TestApproveByDefaultCmd,
  TestDenyByDefaultCmd): Change "values_to_set" to "values_to_get",
                         since that is what is intended.
  (TestPropertySetterValueCmd): Remove; all inheritors changed to
                                inherit from TestPropertySetterCmd.

Show diffs side-by-side

added added

removed removed

Lines of Context:
142
142
# Get DEVICE from initramfs.conf and other files
143
143
. /etc/initramfs-tools/initramfs.conf
144
144
for conf in /etc/initramfs-tools/conf.d/*; do
145
 
    if [ -n "`basename \"$conf\" \
146
 
        | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
147
 
        | grep -v '\.dpkg-.*$'`" ]; then
 
145
    if [ -n `basename \"$conf\" | grep '^[[:alnum:]][[:alnum:]\._-]*$' \
 
146
        | grep -v '\.dpkg-.*$'` ]; then
148
147
        [ -f "${conf}" ] && . "${conf}"
149
148
    fi
150
149
done