diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2021-12-29 19:04:06 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2021-12-29 19:04:06 -0600 |
| commit | fd709885872e6392b5f4cb3363cc29a8f0a617c3 (patch) | |
| tree | 76ddede57e6feb0276da13620846a2d925191f9c | |
| parent | cab458e27afe8dda78bef7c3605830f418d83ed1 (diff) | |
remove separate pam directory
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | pam/meson.build | 9 | ||||
| -rw-r--r-- | pam/start-stop-daemon | 6 | ||||
| -rw-r--r-- | pam/supervise-daemon | 6 | ||||
| -rw-r--r-- | src/rc/meson.build | 16 |
5 files changed, 16 insertions, 24 deletions
diff --git a/meson.build b/meson.build index e21fae65..dd60ae64 100644 --- a/meson.build +++ b/meson.build @@ -195,9 +195,6 @@ subdir('etc') subdir('init.d') subdir('local.d') subdir('man') -if get_option('pam') -subdir('pam') - endif if get_option('pkgconfig') subdir('pkgconfig') endif diff --git a/pam/meson.build b/pam/meson.build deleted file mode 100644 index 81c019ea..00000000 --- a/pam/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -pam_dir = get_option('sysconfdir') / 'pam.d' - -pam_files = [ - 'start-stop-daemon', - 'supervise-daemon', - ] - -install_data(pam_files, - install_dir : pam_dir) diff --git a/pam/start-stop-daemon b/pam/start-stop-daemon deleted file mode 100644 index a1bada22..00000000 --- a/pam/start-stop-daemon +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_permit.so -account required pam_permit.so -password required pam_deny.so -session optional pam_limits.so diff --git a/pam/supervise-daemon b/pam/supervise-daemon deleted file mode 100644 index a1bada22..00000000 --- a/pam/supervise-daemon +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_permit.so -account required pam_permit.so -password required pam_deny.so -session optional pam_limits.so diff --git a/src/rc/meson.build b/src/rc/meson.build index c76587c2..8b3fd205 100644 --- a/src/rc/meson.build +++ b/src/rc/meson.build @@ -100,6 +100,14 @@ executable('start-stop-daemon', install: true, install_dir: sbindir) +if get_option('pam') + pam_dir = get_option('sysconfdir') / 'pam.d' + + install_data('start-stop-daemon.pam', + rename : 'start-stop-daemon', + install_dir : pam_dir) +endif + executable('supervise-daemon', ['supervise-daemon.c', rc_misc_c, rc_plugin_c, rc_schedules_c, usage_c, version_h], @@ -110,6 +118,14 @@ executable('supervise-daemon', install: true, install_dir: sbindir) +if get_option('pam') + pam_dir = get_option('sysconfdir') / 'pam.d' + + install_data('supervise-daemon.pam', + rename : 'supervise-daemon', + install_dir : pam_dir) +endif + if os == 'Linux' executable('openrc-init', ['openrc-init.c', rc_plugin_c, rc_wtmp_c, version_h], |