Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From fc8e93530ba017ecfe111e53d3cbdc3a5b3ac286 Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 3 | Date: Fri, 23 Nov 2018 16:58:38 +0800 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH 01/11] comment out selinux |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [oe specific] |
| 7 | |
| 8 | Signed-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 | |
| 14 | diff --git a/blivet/flags.py b/blivet/flags.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 15 | index 4e26d82..94324ff 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | --- 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 27 | @@ -47,7 +47,8 @@ class Flags(object): |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | # |
| 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 |
| 37 | diff --git a/blivet/util.py b/blivet/util.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 38 | index 9daf151..4eac8b9 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 39 | --- a/blivet/util.py |
| 40 | +++ b/blivet/util.py |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 41 | @@ -3,7 +3,7 @@ import functools |
| 42 | import glob |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 43 | import itertools |
| 44 | import os |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | -import selinux |
| 46 | +#import selinux |
| 47 | import subprocess |
| 48 | import re |
| 49 | import sys |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 50 | @@ -444,6 +444,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 51 | 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 Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 59 | @@ -468,6 +470,8 @@ def set_file_context(path, context, root=None): |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 60 | |
| 61 | True if successful, False if not. |
| 62 | """ |
| 63 | + return False |
| 64 | + |
| 65 | if root is None: |
| 66 | root = '/' |
| 67 | |
| 68 | -- |
| 69 | 2.7.4 |
| 70 | |