diff options
| author | Niels De Graef <nielsdegraef@gmail.com> | 2020-04-30 19:52:28 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@gmail.com> | 2020-04-30 19:52:28 +0000 |
| commit | fb0c97485d90a37ecd870810d2152c7442a9e84c (patch) | |
| tree | 3fb017a34a89bd236d9b30cb72dbc1a7b80e1c1c /data/gdm.service.in | |
| parent | de884de7b69647bead3081222aa1c2be443e351f (diff) | |
| download | gdm-fb0c97485d90a37ecd870810d2152c7442a9e84c.tar.gz | |
data: switch gdm.service.in to use cmake format
We're going to be switching to meson, and meson doesn't
deal too well with an @ in the configuration file that's not
part of a substitution variable.
This commit switches the gdm service over to use a cmake style
of substitution variables, so we can later tell meson to use
configure in cmake mode and workaround the @ confusion.
Diffstat (limited to 'data/gdm.service.in')
| -rw-r--r-- | data/gdm.service.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/gdm.service.in b/data/gdm.service.in index 57d60ada..fbbfb529 100644 --- a/data/gdm.service.in +++ b/data/gdm.service.in @@ -2,15 +2,15 @@ Description=GNOME Display Manager # replaces the getty -Conflicts=getty@tty@GDM_INITIAL_VT@.service -After=getty@tty@GDM_INITIAL_VT@.service +Conflicts=getty@tty${GDM_INITIAL_VT}.service +After=getty@tty${GDM_INITIAL_VT}.service # replaces plymouth-quit since it quits plymouth on its own -Conflicts=@PLYMOUTH_QUIT_SERVICE@ -After=@PLYMOUTH_QUIT_SERVICE@ +Conflicts=${PLYMOUTH_QUIT_SERVICE} +After=${PLYMOUTH_QUIT_SERVICE} # Needs all the dependencies of the services it's replacing -# pulled from getty@.service and @PLYMOUTH_QUIT_SERVICE@ +# pulled from getty@.service and ${PLYMOUTH_QUIT_SERVICE} # (except for plymouth-quit-wait.service since it waits until # plymouth is quit, which we do) After=rc-local.service plymouth-start.service systemd-user-sessions.service @@ -20,14 +20,14 @@ After=rc-local.service plymouth-start.service systemd-user-sessions.service OnFailure=plymouth-quit.service [Service] -ExecStart=@sbindir@/gdm +ExecStart=${sbindir}/gdm KillMode=mixed Restart=always IgnoreSIGPIPE=no BusName=org.gnome.DisplayManager StandardOutput=syslog StandardError=inherit -EnvironmentFile=-@LANG_CONFIG_FILE@ +EnvironmentFile=-${LANG_CONFIG_FILE} ExecReload=/bin/kill -SIGHUP $MAINPID KeyringMode=shared |