diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch deleted file mode 100644 index 90fa387b01..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From fc8e93530ba017ecfe111e53d3cbdc3a5b3ac286 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Fri, 23 Nov 2018 16:58:38 +0800 | ||
| 4 | Subject: [PATCH 01/11] comment out selinux | ||
| 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 | ||
| 15 | index 4e26d82..94324ff 100644 | ||
| 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): | ||
| 27 | @@ -47,7 +47,8 @@ class Flags(object): | ||
| 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 | ||
| 38 | index 9daf151..4eac8b9 100644 | ||
| 39 | --- a/blivet/util.py | ||
| 40 | +++ b/blivet/util.py | ||
| 41 | @@ -3,7 +3,7 @@ import functools | ||
| 42 | import glob | ||
| 43 | import itertools | ||
| 44 | import os | ||
| 45 | -import selinux | ||
| 46 | +#import selinux | ||
| 47 | import subprocess | ||
| 48 | import re | ||
| 49 | import sys | ||
| 50 | @@ -444,6 +444,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): | ||
| 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: | ||
| 59 | @@ -468,6 +470,8 @@ def set_file_context(path, context, root=None): | ||
| 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 | |||
