|
 |
153a29f |
diff --git libsemanage-2.4/tests/test_utilities.c libsemanage-2.4/tests/test_utilities.c
|
|
|
153a29f |
index 4d25b07..32cc33c 100644
|
|
|
153a29f |
--- libsemanage-2.4/tests/test_utilities.c
|
|
|
153a29f |
+++ libsemanage-2.4/tests/test_utilities.c
|
|
|
153a29f |
@@ -45,7 +45,7 @@ void test_slurp_file_filter(void);
|
|
|
153a29f |
|
|
|
153a29f |
char fname[] = {
|
|
|
153a29f |
'T', 'E', 'S', 'T', '_', 'T', 'E', 'M', 'P', '_', 'X', 'X', 'X', 'X',
|
|
|
153a29f |
- 'X', 'X'
|
|
|
153a29f |
+ 'X', 'X', '\0'
|
|
|
153a29f |
};
|
|
|
153a29f |
int fd;
|
|
|
153a29f |
FILE *fptr;
|
|
|
0df50b8 |
diff --git libsemanage-2.4/utils/semanage_migrate_store libsemanage-2.4/utils/semanage_migrate_store
|
|
|
0df50b8 |
index 03b492e..6584002 100755
|
|
|
0df50b8 |
--- libsemanage-2.4/utils/semanage_migrate_store
|
|
|
0df50b8 |
+++ libsemanage-2.4/utils/semanage_migrate_store
|
|
|
0df50b8 |
@@ -221,7 +221,7 @@ def rebuild_policy():
|
|
|
0df50b8 |
|
|
|
0df50b8 |
|
|
|
0df50b8 |
def oldroot_path():
|
|
|
0df50b8 |
- return "/etc/selinux"
|
|
|
0df50b8 |
+ return "%s/etc/selinux" % ROOT
|
|
|
0df50b8 |
|
|
|
0df50b8 |
def oldstore_path(store):
|
|
|
0df50b8 |
return "%s/%s/modules/active" % (oldroot_path(), store)
|
|
|
0df50b8 |
@@ -233,7 +233,7 @@ def disabledmodules_path(store):
|
|
|
0df50b8 |
return "%s/disabled" % newmodules_path(store)
|
|
|
0df50b8 |
|
|
|
0df50b8 |
def newroot_path():
|
|
|
0df50b8 |
- return PATH
|
|
|
0df50b8 |
+ return "%s%s" % (ROOT, PATH)
|
|
|
0df50b8 |
|
|
|
0df50b8 |
def newstore_path(store):
|
|
|
0df50b8 |
return "%s/%s/active" % (newroot_path(), store)
|
|
|
0df50b8 |
@@ -260,6 +260,8 @@ if __name__ == "__main__":
|
|
|
0df50b8 |
help="Disable rebuilding policy after migration (default: no)")
|
|
|
0df50b8 |
parser.add_option("-P", "--path", dest="path",
|
|
|
0df50b8 |
help="Set path for the policy store (default: /var/lib/selinux)")
|
|
|
0df50b8 |
+ parser.add_option("-r", "--root", dest="root",
|
|
|
0df50b8 |
+ help="Set an alternative root for the migration (default: /)")
|
|
|
0df50b8 |
|
|
|
0df50b8 |
(options, args) = parser.parse_args()
|
|
|
0df50b8 |
|
|
|
0df50b8 |
@@ -272,6 +274,10 @@ if __name__ == "__main__":
|
|
|
0df50b8 |
if PATH is None:
|
|
|
0df50b8 |
PATH = "/var/lib/selinux"
|
|
|
0df50b8 |
|
|
|
0df50b8 |
+ ROOT = options.root
|
|
|
0df50b8 |
+ if ROOT is None:
|
|
|
0df50b8 |
+ ROOT = ""
|
|
|
0df50b8 |
+
|
|
|
0df50b8 |
# List of paths that go in the active 'root'
|
|
|
0df50b8 |
TOPPATHS = [
|
|
|
0df50b8 |
"commit_num",
|