Revert "policycoreutils: semodule: support for alternative root paths"

This reverts commit 5e096d9ceb.

Conflicts:

	policycoreutils/semodule/semodule.c
This commit is contained in:
Steve Lawrence 2011-09-27 12:27:04 -04:00
parent 30a2df81eb
commit 5ac1e98ab2

View file

@ -163,7 +163,6 @@ static void parse_command_line(int argc, char **argv)
{"build", 0, NULL, 'B'}, {"build", 0, NULL, 'B'},
{"disable_dontaudit", 0, NULL, 'D'}, {"disable_dontaudit", 0, NULL, 'D'},
{"preserve_tunables", 0, NULL, 'P'}, {"preserve_tunables", 0, NULL, 'P'},
{"path", required_argument, NULL, 'p'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
int i; int i;
@ -172,7 +171,7 @@ static void parse_command_line(int argc, char **argv)
no_reload = 0; no_reload = 0;
create_store = 0; create_store = 0;
while ((i = while ((i =
getopt_long(argc, argv, "p:s:b:hi:lvqr:u:RnNBDP", opts, getopt_long(argc, argv, "s:b:hi:lvqr:u:RnNBDP", opts,
NULL)) != -1) { NULL)) != -1) {
switch (i) { switch (i) {
case 'b': case 'b':
@ -194,9 +193,6 @@ static void parse_command_line(int argc, char **argv)
case 'r': case 'r':
set_mode(REMOVE_M, optarg); set_mode(REMOVE_M, optarg);
break; break;
case 'p':
semanage_set_root(optarg);
break;
case 'u': case 'u':
set_mode(UPGRADE_M, optarg); set_mode(UPGRADE_M, optarg);
break; break;