mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
f01d87a7e8
Drop 0012-remove-dmraid-dependency-check.patch and 0013-add-Z-y-and-y-to-lvm.pvcreate.patch which the new version has fixed the issues Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
71 lines
1.7 KiB
Diff
71 lines
1.7 KiB
Diff
From fc8e93530ba017ecfe111e53d3cbdc3a5b3ac286 Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Fri, 23 Nov 2018 16:58:38 +0800
|
|
Subject: [PATCH 01/11] comment out selinux
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
blivet/flags.py | 5 +++--
|
|
blivet/util.py | 6 +++++-
|
|
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/blivet/flags.py b/blivet/flags.py
|
|
index 4e26d82..94324ff 100644
|
|
--- a/blivet/flags.py
|
|
+++ b/blivet/flags.py
|
|
@@ -20,7 +20,7 @@
|
|
#
|
|
|
|
import shlex
|
|
-import selinux
|
|
+#import selinux
|
|
|
|
|
|
class Flags(object):
|
|
@@ -47,7 +47,8 @@ class Flags(object):
|
|
#
|
|
# enable/disable functionality
|
|
#
|
|
- self.selinux = selinux.is_selinux_enabled()
|
|
+ #self.selinux = selinux.is_selinux_enabled()
|
|
+ self.selinux = False
|
|
self.multipath = True
|
|
self.dmraid = True
|
|
self.ibft = True
|
|
diff --git a/blivet/util.py b/blivet/util.py
|
|
index 9daf151..4eac8b9 100644
|
|
--- a/blivet/util.py
|
|
+++ b/blivet/util.py
|
|
@@ -3,7 +3,7 @@ import functools
|
|
import glob
|
|
import itertools
|
|
import os
|
|
-import selinux
|
|
+#import selinux
|
|
import subprocess
|
|
import re
|
|
import sys
|
|
@@ -444,6 +444,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath):
|
|
def match_path_context(path):
|
|
""" Return the default SELinux context for the given path. """
|
|
context = None
|
|
+ return context
|
|
+
|
|
try:
|
|
context = selinux.matchpathcon(os.path.normpath(path), 0)[1]
|
|
except OSError as e:
|
|
@@ -468,6 +470,8 @@ def set_file_context(path, context, root=None):
|
|
|
|
True if successful, False if not.
|
|
"""
|
|
+ return False
|
|
+
|
|
if root is None:
|
|
root = '/'
|
|
|
|
--
|
|
2.7.4
|
|
|