mirror of
https://git.yoctoproject.org/meta-security
synced 2026-07-16 03:47:21 +00:00
Andrei Dinu
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 456daee3ce57d3a46bf9ccf0a85ec4880ca5b262 Mon Sep 17 00:00:00 2001
|
|
From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
|
Date: Tue, 4 Jun 2013 14:56:21 +0300
|
|
Subject: [PATCH] Curses and IOLoader changes
|
|
|
|
The linux distribution couldn't be identified when
|
|
running Bastille, and the question pruning method
|
|
couldn't get a match on the questions relevant to
|
|
the repo, so it eliminated all quetions.
|
|
|
|
After answering the questions the checkAndSaveConfig routine
|
|
was called which was missing. Replaced it with Run_Bastille_
|
|
with_Config which exists.
|
|
|
|
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
|
---
|
|
Bastille/IOLoader.pm | 2 +-
|
|
Bastille_Curses.pm | 4 +++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Bastille/IOLoader.pm b/Bastille/IOLoader.pm
|
|
index abb94d7..995d2c2 100644
|
|
--- a/Bastille/IOLoader.pm
|
|
+++ b/Bastille/IOLoader.pm
|
|
@@ -68,7 +68,7 @@ sub Load_Questions($) {
|
|
my $UseRequiresRules = $_[0];
|
|
|
|
my ($current_module_number,$first_question) = &parse_questions();
|
|
- $first_question = &prune_questions($UseRequiresRules,$first_question);
|
|
+ #$first_question = &prune_questions($UseRequiresRules,$first_question);
|
|
$firstQuestion = $first_question;
|
|
&B_log("DEBUG","Load Questions, first question: $first_question");
|
|
&validate_questions();
|
|
diff --git a/Bastille_Curses.pm b/Bastille_Curses.pm
|
|
index 2e1eef4..edbbe45 100644
|
|
--- a/Bastille_Curses.pm
|
|
+++ b/Bastille_Curses.pm
|
|
@@ -84,7 +84,9 @@ sub do_Bastille {
|
|
}
|
|
|
|
# Output answers to the script and display
|
|
- &checkAndSaveConfig(&getGlobal('BFILE', "config"));
|
|
+ #&checkAndSaveConfig(&getGlobal('BFILE', "config"));
|
|
+
|
|
+ &Run_Bastille_with_Config;
|
|
|
|
# Run Bastille
|
|
|
|
--
|
|
1.7.9.5
|
|
|