tizen: Disable virtualization feature

1. Tizen does not support continer and vm.

2. Resolving Smack error.
==========================================================================================
Jan 01 09:00:19 localhost audit[591]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=591 comm="systemd" name="sched" dev="proc" ino=12322
Jan 01 09:00:19 localhost audit[591]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=591 comm="systemd" name="sched" dev="proc" ino=12322
Jan 01 09:00:19 localhost audit[591]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=591 comm="systemd" name="sched" dev="proc" ino=12322

Jan 01 09:00:19 localhost audit[535]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=535 comm="tlm-sessiond" name="environ" dev="proc" ino=12572
Jan 01 09:00:19 localhost audit[535]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=535 comm="tlm-sessiond" name="sched" dev="proc" ino=12322

Jan 01 09:00:30 localhost audit[949]: AVC lsm=SMACK fn=smack_inode_permission action=denied subject="User" object="System::Privileged" requested=r pid=949 comm="systemctl" name="sched" dev="proc" ino=12322
==========================================================================================

Change-Id: I8b947a0de6c030fa7dd4f8d8b080b1f7783a4010
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/meson.build b/meson.build
index df3eb9c..b708ea9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1616,6 +1616,7 @@ foreach term : ['analyze',
                 'tpm',
                 'userdb',
                 'utmp',
+                'virt',
                 'vconsole',
                 'xdg-autostart']
         have = get_option(term)
@@ -2856,6 +2857,7 @@ foreach tuple : [
         ['fexecve'],
         ['standalone-binaries',    get_option('standalone-binaries')],
         ['coverage',               get_option('b_coverage')],
+        ['virt'],
 ]
 
         if tuple.length() >= 2

diff --git a/meson_options.txt b/meson_options.txt
index c333688..f3272f0 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -471,6 +471,9 @@ option('efi-color-highlight', type : 'string', value : 'black,lightgray',
 option('efi-color-edit', type : 'string', value : 'black,lightgray',
        description : 'boot loader color for option line edit')
 
+option('virt', type : 'boolean',
+       description : 'virtualization support')
+
 option('bashcompletiondir', type : 'string',
        description : 'directory for bash completion scripts ["no" disables]')
 option('zshcompletiondir', type : 'string',

diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 1588b53..96ef6dd 100644 (file)
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -25,7 +25,7 @@ items = [['busctl',              ''],
          ['systemd-cgls',        ''],
          ['systemd-cgtop',       ''],
          ['systemd-delta',       ''],
-         ['systemd-detect-virt', ''],
+         ['systemd-detect-virt', 'ENABLE_VIRT'],
          ['systemd-id128',       ''],
          ['systemd-nspawn',      ''],
          ['systemd-path',        ''],

diff --git a/src/basic/virt.c b/src/basic/virt.c
index a0b6fbc..91dd0ad 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -442,6 +442,7 @@ static Virtualization detect_vm_zvm(void) {
 
 /* Returns a short identifier for the various VM implementations */
 Virtualization detect_vm(void) {
+#if ENABLE_VIRT
         static thread_local Virtualization cached_found = _VIRTUALIZATION_INVALID;
         bool other = false;
         int xen_dom0 = 0;
@@ -546,6 +547,9 @@ finish:
         cached_found = v;
         log_debug("Found VM virtualization %s", virtualization_to_string(v));
         return v;
+#else
+        return VIRTUALIZATION_NONE;
+#endif
 }
 
 static const char *const container_table[_VIRTUALIZATION_MAX] = {
@@ -655,6 +659,7 @@ static Virtualization detect_container_files(void) {
 }
 
 Virtualization detect_container(void) {
+#if ENABLE_VIRT
         static thread_local Virtualization cached_found = _VIRTUALIZATION_INVALID;
         _cleanup_free_ char *m = NULL, *o = NULL, *p = NULL;
         const char *e = NULL;
@@ -800,6 +805,9 @@ finish:
         log_debug("Found container virtualization %s.", virtualization_to_string(v));
         cached_found = v;
         return v;
+#else
+        return VIRTUALIZATION_NONE;
+#endif
 }
 
 Virtualization detect_virtualization(void) {

diff --git a/src/detect-virt/meson.build b/src/detect-virt/meson.build
index 7bcb298..7977eb9 100644 (file)
--- a/src/detect-virt/meson.build
+++ b/src/detect-virt/meson.build
@@ -1,9 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-executables += [
-        executable_template + {
-                'name' : 'systemd-detect-virt',
-                'public' : true,
-                'sources' : files('detect-virt.c'),
-        },
-]
+if conf.get('ENABLE_VIRT') == 1
+        executables += [
+                executable_template + {
+                        'name' : 'systemd-detect-virt',
+                        'public' : true,
+                        'sources' : files('detect-virt.c'),
+                },
+        ]
+endif