blob: c77b86a455977cd09573ec9b849f652f07e99c40 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08003Date: Mon, 30 Jul 2018 16:13:40 +0800
4Subject: [PATCH 01/11] comment out selinux
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Upstream-Status: Inappropriate [oe specific]
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 blivet/flags.py | 5 +++--
11 blivet/util.py | 6 +++++-
12 2 files changed, 8 insertions(+), 3 deletions(-)
13
14diff --git a/blivet/flags.py b/blivet/flags.py
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080015index 1840121..8789390 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050016--- a/blivet/flags.py
17+++ b/blivet/flags.py
18@@ -20,7 +20,7 @@
19 #
20
21 import shlex
22-import selinux
23+#import selinux
24
25
26 class Flags(object):
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080027@@ -47,7 +47,8 @@ class Flags(object):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028 #
29 # enable/disable functionality
30 #
31- self.selinux = selinux.is_selinux_enabled()
32+ #self.selinux = selinux.is_selinux_enabled()
33+ self.selinux = False
34 self.multipath = True
35 self.dmraid = True
36 self.ibft = True
37diff --git a/blivet/util.py b/blivet/util.py
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080038index 7334ff6..0f2a995 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050039--- a/blivet/util.py
40+++ b/blivet/util.py
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080041@@ -3,7 +3,7 @@ import functools
42 import glob
Brad Bishopd7bf8c12018-02-25 22:55:05 -050043 import itertools
44 import os
Brad Bishopd7bf8c12018-02-25 22:55:05 -050045-import selinux
46+#import selinux
47 import subprocess
48 import re
49 import sys
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080050@@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050051 def match_path_context(path):
52 """ Return the default SELinux context for the given path. """
53 context = None
54+ return context
55+
56 try:
57 context = selinux.matchpathcon(os.path.normpath(path), 0)[1]
58 except OSError as e:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080059@@ -454,6 +456,8 @@ def set_file_context(path, context, root=None):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050060
61 True if successful, False if not.
62 """
63+ return False
64+
65 if root is None:
66 root = '/'
67
68--
692.7.4
70