mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 16:59:28 +00:00
mulhern
6e23502b38
[YOCTO #3867] Five additional patches which cause the --os flag to be accepted and observed are added. An additional distro, Yocto, is added. The individual patches are described below. upgrade_options_processing.patch: Changes setOptions procedure so that it accepts named parameters for greater flexibility and adjusts all invocations accordingly. Uses more precise specifications in invocatiosn of Getop::Long::GetOptions. Omits code associated with a commented out flag. accept_os_flag_in_backend.patch: Accepts and observes an additional --os flag in BastilleBackEnd. allow_os_with_assess.patch: No longer print a usage message and quit if --assess or its related flags are specified along with the --os flag. edit_usage_message.patch: Edit usage message to include the specification of an --os flag with the specification of an --assess flag. organize_distro_discovery.patch: Separates inferring the distro from specifying the distro. Adds a "Yocto" distro among the other Linux distros. Causes the specified distro to override the inferred distro with a warning message when they are different. Previously if either the inferred distro or the specified distro was not among supported distros Bastille would quit with an error. Signed-off-by: mulhern <mulhern@yoctoproject.org>
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
Upstream Status: Inappropriate [No upstream maintenance]
|
|
|
|
Signed-off-by: Anne Mulhern <mulhern@yoctoproject.org>
|
|
|
|
---
|
|
|
|
Index: Bastille/bin/bastille
|
|
===================================================================
|
|
--- Bastille.orig/bin/bastille 2013-08-25 14:16:35.614779001 -0400
|
|
+++ Bastille/bin/bastille 2013-08-25 14:16:38.674779000 -0400
|
|
@@ -60,7 +60,7 @@
|
|
printUsage () {
|
|
cat >&2 << EOF
|
|
$ERRSPACES Usage: bastille [ -b | -c | -x ] [ --os <version>] [ -f <alternate config> ]
|
|
-$ERRSPACES bastille [-r | -l | -h | --assess | --assessnobrowser ]
|
|
+$ERRSPACES bastille [-r | -l | -h | --assess | --assessnobrowser ] [ --os <version> ]
|
|
$ERRSPACES -b : use a saved config file to apply changes
|
|
$ERRSPACES directly to system
|
|
$ERRSPACES -c : use the Curses (non-X11) GUI, not available on HP-UX
|
|
Index: Bastille/Bastille/API.pm
|
|
===================================================================
|
|
--- Bastille.orig/Bastille/API.pm 2013-08-25 08:15:40.266779002 -0400
|
|
+++ Bastille/Bastille/API.pm 2013-08-25 14:18:22.750778811 -0400
|
|
@@ -206,7 +206,7 @@
|
|
#options before interactive or Bastille runs, so this check is often redundant
|
|
$GLOBAL_ERROR{"usage"}="\n".
|
|
"$spc Usage: bastille [ -b | -c | -x ] [ --os <version> ] [ -f <alternate config> ]\n".
|
|
- "$spc bastille [ -r | --assess | --assessnobowser ]\n\n".
|
|
+ "$spc bastille [ -r | --assess | --assessnobowser ] [ --os <version> ]\n\n".
|
|
"$spc --assess : check status of system and report in browser\n".
|
|
"$spc --assessnobrowser : check status of system and list report locations\n".
|
|
"$spc -b : use a saved config file to apply changes\n".
|