chiark / gitweb /
vconsole-setup: fix vconsole.conf vs. cmdline overriding logic
authorMichal Schmidt <mschmidt@redhat.com>
Fri, 5 Apr 2013 11:32:34 +0000 (13:32 +0200)
committerMichal Schmidt <mschmidt@redhat.com>
Fri, 5 Apr 2013 11:46:47 +0000 (13:46 +0200)
commit2034ec42ec9e18db1ec908c87bb7c24cc63d2412
tree3a29e2f7a5213ff6b13524925e6f7d0d40dfa990
parentc784c5ce777f16ee56086a072dc1466639bc9eff
vconsole-setup: fix vconsole.conf vs. cmdline overriding logic

Skipping the parsing of /etc/vconsole.conf just because some values were
already assigned from the cmdline never made sense. And by the way, commit
f73141d changed the return values of parse_env_file() - it now gives 0
on success. Which means in current HEAD /etc/vconsole.conf overrides the
cmdline, which is the reverse of what's expected.

We need to parse /etc/vconsole.conf first and then let vconsole.*
overrides from cmdline take effect. The behaviour is documented in
vconsole.conf(5).

https://bugzilla.redhat.com/show_bug.cgi?id=948750
src/vconsole/vconsole-setup.c