From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 11 Feb 2019 12:23:01 +0000 (+0100)
Subject: meson: systemd - abandon user_mode
X-Git-Tag: v4.0.0~24^2~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d82fea3d74e6745b9115b0902b45db1288a7da78;p=thirdparty%2Fknot-resolver.git

meson: systemd - abandon user_mode
---

diff --git a/meson.build b/meson.build
index 1ce3c3c1b..c81955ad9 100644
--- a/meson.build
+++ b/meson.build
@@ -86,8 +86,6 @@ if opt_systemd != 'disabled'
   endif
   message('---------------------------')
 endif
-# TODO systemd_user_mode
-systemd_user_mode = false
 
 # TODO use var instead
 add_global_arguments(
@@ -169,7 +167,6 @@ endif
 summary_managed_ta = managed_ta ? 'enabled' : 'disabled'
 summary_systemd = systemd ? 'enabled' : 'disabled'
 summary_systemd_socket = systemd_socket ? 'enabled' : 'disabled'
-summary_systemd_user_mode = systemd_user_mode ? 'enabled' : 'disabled'
 summary_build_client = build_client ? 'enabled' : 'disabled'
 summary_build_daemon = build_daemon ? 'enabled' : 'disabled'
 summary_build_doc = build_doc ? 'enabled' : 'disabled'
@@ -190,9 +187,7 @@ message('''
 
   systemd:              @0@'''.format(summary_systemd) + '''
     socket activation:  @0@'''.format(summary_systemd_socket) + '''
-    user mode:          @0@'''.format(summary_systemd_user_mode) + '''
     work_dir:           @0@'''.format(systemd_work_dir) + '''
-    run_dir:            @0@'''.format(run_dir) + '''
 
   components
     client:             @0@'''.format(summary_build_client) + '''
diff --git a/meson_options.txt b/meson_options.txt
index 8e3ee76bf..20b2a7086 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -53,13 +53,6 @@ option(
   description: 'create systemd unit files',
 )
 
-option(
-  'systemd_user_mode',
-  type: 'feature',
-  value: 'disabled',
-  description: 'use systemd user mode (for debug/testing)',
-)
-
 
 # Component options
 option(
diff --git a/systemd/meson.build b/systemd/meson.build
index 205e604fb..0badeecf8 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -1,7 +1,6 @@
 # systemd
 
 ## paths
-# TODO user mode; prefix==/usr/local
 systemd_work_dir = join_paths(
   prefix, get_option('localstatedir'), 'cache', 'knot-resolver')
 run_dir = join_paths('/run', 'knot-resolver')