]>
Commit | Line | Data |
---|---|---|
84120e83 JB |
1 | --- plymouth-24.004.60/meson_options.txt.orig 2024-01-04 22:08:14.000000000 +0100 |
2 | +++ plymouth-24.004.60/meson_options.txt 2024-02-17 07:49:24.640032483 +0100 | |
3 | @@ -83,3 +83,8 @@ option('docs', | |
4 | value: true, | |
5 | description: 'Build documentation', | |
6 | ) | |
7 | +option('systemd_ask_password_agent_path', | |
8 | + type: 'string', | |
9 | + value: '', | |
10 | + description: 'path to systemd-tty-ask-password-agent', | |
11 | +) | |
12 | --- plymouth-24.004.60/systemd-units/meson.build.orig 2024-01-04 22:08:14.000000000 +0100 | |
13 | +++ plymouth-24.004.60/systemd-units/meson.build 2024-02-17 07:51:17.026090302 +0100 | |
14 | @@ -21,7 +21,7 @@ foreach unit_templ : systemd_unit_templa | |
15 | 'PLYMOUTH_CLIENT_DIR': get_option('prefix') / get_option('bindir'), | |
16 | 'PLYMOUTH_DAEMON_DIR': get_option('prefix') / get_option('sbindir'), | |
17 | 'plymouthruntimedir': plymouth_runtime_dir, | |
18 | - 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent.full_path(), | |
19 | + 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent_path, | |
20 | }, | |
21 | install: true, | |
22 | install_dir: systemd_unit_dir, | |
23 | --- plymouth-24.004.60/meson.build.orig 2024-02-17 07:52:35.985662541 +0100 | |
24 | +++ plymouth-24.004.60/meson.build 2024-02-17 07:52:39.992307502 +0100 | |
25 | @@ -44,7 +44,12 @@ if get_option('systemd-integration') | |
26 | systemd_unit_dir = systemd_dep.get_variable('systemdsystemunitdir', | |
27 | pkgconfig_define: [ 'rootprefix', get_option('prefix') ], | |
28 | ) | |
29 | - systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent') | |
30 | + if get_option('systemd_ask_password_agent_path') == '' | |
31 | + systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent') | |
32 | + systemd_ask_password_agent_path = systemd_ask_password_agent.full_path() | |
33 | + else | |
34 | + systemd_ask_password_agent_path = get_option('systemd_ask_password_agent_path') | |
35 | + endif | |
36 | endif | |
37 | ||
38 | if get_option('upstart-monitoring') |