diff options
author | Andrei Dinu <andrei.adrianx.dinu@intel.com> | 2013-06-17 17:24:38 +0300 |
---|---|---|
committer | Andrei Dinu <andrei.adrianx.dinu@intel.com> | 2013-06-17 17:24:38 +0300 |
commit | 60d90b25631471e8193b3069c6a520ccf7c82008 (patch) | |
tree | e413ea3904059ff52a4539aeff358518fa0ae327 /recipes-security/bastille/files/Curses-and-IOLoader-changes.patch | |
download | meta-security-60d90b25631471e8193b3069c6a520ccf7c82008.tar.gz |
meta-security : initial commit
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Diffstat (limited to 'recipes-security/bastille/files/Curses-and-IOLoader-changes.patch')
-rw-r--r-- | recipes-security/bastille/files/Curses-and-IOLoader-changes.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-security/bastille/files/Curses-and-IOLoader-changes.patch b/recipes-security/bastille/files/Curses-and-IOLoader-changes.patch new file mode 100644 index 0000000..1fb2235 --- /dev/null +++ b/recipes-security/bastille/files/Curses-and-IOLoader-changes.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 456daee3ce57d3a46bf9ccf0a85ec4880ca5b262 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
3 | Date: Tue, 4 Jun 2013 14:56:21 +0300 | ||
4 | Subject: [PATCH] Curses and IOLoader changes | ||
5 | |||
6 | The linux distribution couldn't be identified when | ||
7 | running Bastille, and the question pruning method | ||
8 | couldn't get a match on the questions relevant to | ||
9 | the repo, so it eliminated all quetions. | ||
10 | |||
11 | After answering the questions the checkAndSaveConfig routine | ||
12 | was called which was missing. Replaced it with Run_Bastille_ | ||
13 | with_Config which exists. | ||
14 | |||
15 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
16 | --- | ||
17 | Bastille/IOLoader.pm | 2 +- | ||
18 | Bastille_Curses.pm | 4 +++- | ||
19 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/Bastille/IOLoader.pm b/Bastille/IOLoader.pm | ||
22 | index abb94d7..995d2c2 100644 | ||
23 | --- a/Bastille/IOLoader.pm | ||
24 | +++ b/Bastille/IOLoader.pm | ||
25 | @@ -68,7 +68,7 @@ sub Load_Questions($) { | ||
26 | my $UseRequiresRules = $_[0]; | ||
27 | |||
28 | my ($current_module_number,$first_question) = &parse_questions(); | ||
29 | - $first_question = &prune_questions($UseRequiresRules,$first_question); | ||
30 | + #$first_question = &prune_questions($UseRequiresRules,$first_question); | ||
31 | $firstQuestion = $first_question; | ||
32 | &B_log("DEBUG","Load Questions, first question: $first_question"); | ||
33 | &validate_questions(); | ||
34 | diff --git a/Bastille_Curses.pm b/Bastille_Curses.pm | ||
35 | index 2e1eef4..edbbe45 100644 | ||
36 | --- a/Bastille_Curses.pm | ||
37 | +++ b/Bastille_Curses.pm | ||
38 | @@ -84,7 +84,9 @@ sub do_Bastille { | ||
39 | } | ||
40 | |||
41 | # Output answers to the script and display | ||
42 | - &checkAndSaveConfig(&getGlobal('BFILE', "config")); | ||
43 | + #&checkAndSaveConfig(&getGlobal('BFILE', "config")); | ||
44 | + | ||
45 | + &Run_Bastille_with_Config; | ||
46 | |||
47 | # Run Bastille | ||
48 | |||
49 | -- | ||
50 | 1.7.9.5 | ||
51 | |||