Skip to content

Handle sysconfig files without empty line after "Path" #229

@tacerus

Description

@tacerus

The security-formula (with the help of the sysconfig-formula) will add a header to /etc/sysconfig/security, but upon the next execution of fillup, another "Description" block is inserted:

# truncate -s0 /etc/sysconfig/security
# /bin/fillup -q /etc/sysconfig/security /usr/share/fillup-templates/sysconfig.security
# salt-call state.apply security
...
# cp /etc/sysconfig/security /tmp/security.salt
# /bin/fillup -q /etc/sysconfig/security /usr/share/fillup-templates/sysconfig.security
# cp /etc/sysconfig/security /tmp/security.salt.fillup
# diff /tmp/security.salt{,.fillup}
1a2,4
> ## Description: Configuration of permissions on the system
> ## Type:        string
> ## Default:     "easy local"

I presume this is because the fillup template at /usr/share/fillup-templates/sysconfig.security does not have an empty line after "Path", making fillup consider "Path" and "Description" to belong to the same block.

Effectively this causes ping-pong between Salt and fillup upon package updates.

My first idea was to patch the fillup template, however on a short glance at /usr/share/fillup-templates/sysconfig.* there is no real consistency with the "Path" lines, the "security" template is just one candidate.

A workaround would be to add logic which silently stops header insertion if a sysconfig file which cannot be managed without conflicts with fillup is passed.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions