Revision: 2163
http://svn.sourceforge.net/selinux/?rev=2163&view=rev
Author: ssmalley
Date: 2007-01-09 12:47:51 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
The following patch allows semodule to handle a list of modules for
installation (i.e., semodule -i *.pp now works).
Signed-off-by: Karl MacMillan <kma...@me...>
Acked-by: Joshua Brindle <jbr...@tr...>
Author: Karl MacMillan
Email: kma...@me...
Subject: allow semodule -i to accept list of modules
Date: Mon, 08 Jan 2007 16:43:47 -0500
Modified Paths:
--------------
trunk/policycoreutils/semodule/semodule.c
Modified: trunk/policycoreutils/semodule/semodule.c
===================================================================
--- trunk/policycoreutils/semodule/semodule.c 2007-01-09 20:41:26 UTC (rev 2162)
+++ trunk/policycoreutils/semodule/semodule.c 2007-01-09 20:47:51 UTC (rev 2163)
@@ -225,15 +225,6 @@
}
}
}
- if (optind < argc) {
- fprintf(stderr, "Extraneous arguments: ");
- while (optind < argc)
- fprintf(stderr, "%s", argv[optind++]);
- fprintf(stderr, "\n");
- usage(argv[0]);
- cleanup();
- exit(1);
- }
if ((build || reload) && num_commands) {
fprintf(stderr,
"build or reload should not be used with other commands\n");
@@ -245,6 +236,24 @@
usage(argv[0]);
exit(1);
}
+
+ if (optind < argc) {
+ /* if -i was the last command treat any remaining
+ * arguments as modules to allow 'semodule -i *.pp' to
+ * work as expected.
+ */
+ if (commands[num_commands - 1].mode == INSTALL_M) {
+ while (optind < argc)
+ set_mode(INSTALL_M, argv[optind++]);
+ } else {
+ fprintf(stderr, "unknown additional arguments:\n");
+ while (optind < argc)
+ fprintf(stderr, " %s", argv[optind++]);
+ fprintf(stderr, "\n\n");
+ usage(argv[0]);
+ exit(1);
+ }
+ }
}
int main(int argc, char *argv[])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
