[PATCH xfree86] systemd-logind.c: don't parse VT settings for non-seat0 X servers

[Hans de Goede]

Hi,

On 02-12-15 16:53, Adam Jackson wrote:
> On Wed, 2015-12-02 at 12:33 +0100, Hans de Goede wrote:
>> Hi,
>>
>> On 02-12-15 11:16, Laércio de Sousa wrote:
>>> Since non-seat0 X servers no longer touch VTs since release 1.16,
>>> I believe these settings are unnecessary.
>>>
>>> Signed-off-by: Laércio de Sousa <laerciosousa at sme-mogidascruzes.sp.
>>> gov.br>
>>
>> You're right:
>>
>> Reviewed-by: Hans de Goede <hdegoede at redhat.com>
>>
>> Ajax, can you pick this one up please ?
>
> When applied to master, this breaks the build for me here:
>
> In file included from ../../../../hw/xfree86/common/xf86platformBus.h:27:0,
>                   from systemd-logind.c:39:
> systemd-logind.c: In function 'systemd_logind_init':
> ../../../../include/hotplug.h:78:29: error: 'SeatId' undeclared (first use in this function)
>   #define ServerIsNotSeat0() (SeatId && strcmp(SeatId, "seat0"))
>                               ^
> systemd-logind.c:618:10: note: in expansion of macro 'ServerIsNotSeat0'
>       if (!ServerIsNotSeat0() && linux_parse_vt_settings(TRUE) && !linux_get_keep
>            ^
> ../../../../include/hotplug.h:78:29: note: each undeclared identifier is reported only once for each function it appears in
>   #define ServerIsNotSeat0() (SeatId && strcmp(SeatId, "seat0"))
>                               ^
> systemd-logind.c:618:10: note: in expansion of macro 'ServerIsNotSeat0'
>       if (!ServerIsNotSeat0() && linux_parse_vt_settings(TRUE) && !linux_get_keep
>            ^
> Makefile:659: recipe for target 'systemd-logind.lo' failed

Ugh, sorry about that, I was under the assumption that ServerIsNotSeat0 is a function,
so that the patch would just work, so I did not test it.

Laércio, fixing this requires adding a  #include "globals.h"  to systemd-logind.c,
can you do a v2 with this fixed please ?

Regards,

Hans