Differential D42097

Xservers as base for Xserver args
ClosedPublic
Actions

Authored by cy on Oct 5 2023, 9:24 PM.

Details

Reviewers

kbowling
manu

Group Reviewers

x11

Commits

R11:0c7256704da0: x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args
R11:2f6254b9fd6a: x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args

Summary

Hard coding Xserver args forces people to invoke xdm through init
by placing an entry in /etc/ttys when Xserver args different from
those hardcoded in rc.d/xdm are desired. Instead glean arguments
from $LOCALBASE/etc/xdm/Xservers, defaulting to the hardcoded
entry if none are found for :0.

Test Plan

Tested and working here.

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

cy requested review of this revision.Oct 5 2023, 9:24 PM

cy created this revision.

cy added reviewers: kbowling, manu.Oct 5 2023, 9:26 PM

manu accepted this revision.Oct 6 2023, 5:32 AM

This revision is now accepted and ready to land.Oct 6 2023, 5:32 AM

The original patch didn't take into account that a user might change the DisplayManager.servers resource to point to different file from the default file. The DisplayManager.servers resource could also be set to a string (just like -servers sets the resource), meaning it may not be a file. xdm will assume it's a file if the string begins with a slash ("/"). We need to take this also into account.

Again, this has been tested and is currently running here.

This revision now requires review to proceed.Oct 9 2023, 4:52 AM

manu accepted this revision.Oct 9 2023, 5:24 AM

This revision is now accepted and ready to land.Oct 9 2023, 5:24 AM

Closed by commit R11:2f6254b9fd6a: x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args (authored by cy). · Explain WhyOct 11 2023, 2:52 AM

This revision was automatically updated to reflect the committed changes.

cy added a commit: R11:2f6254b9fd6a: x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args.

cy added a reverting change: R11:5752faaa0d6d: Revert "x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args".Oct 11 2023, 5:28 AM

cy added a commit: R11:0c7256704da0: x11/xdm: Use $LOCALBASE/etc/xdm/Xservers as base for Xserver args.