aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-06-29 02:26:40 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-06 11:29:47 +0800
commitab622779a8f12660d7829fbb5b21681db08e7a59 (patch)
tree55aa294b5e9075fd049a998bf6d4ca95ae9d803d
parent54042d7c16586c709df6813e44ea0c98a30b52a0 (diff)
downloadmeta-anaconda-ab622779a8f12660d7829fbb5b21681db08e7a59.tar.gz
meta-anaconda-ab622779a8f12660d7829fbb5b21681db08e7a59.tar.bz2
meta-anaconda-ab622779a8f12660d7829fbb5b21681db08e7a59.zip
python3-anaconda re-organize local patch: rebase 0038-support-to-get-kickstart-from-network.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0038-support-to-get-kickstart-from-network.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-installer/anaconda/files/0038-support-to-get-kickstart-from-network.patch b/recipes-installer/anaconda/files/0038-support-to-get-kickstart-from-network.patch
index 29e6b57..76fcf2f 100644
--- a/recipes-installer/anaconda/files/0038-support-to-get-kickstart-from-network.patch
+++ b/recipes-installer/anaconda/files/0038-support-to-get-kickstart-from-network.patch
@@ -1,7 +1,7 @@
-From 7d792905f4536f77b30892428e8b788f1bf974cf Mon Sep 17 00:00:00 2001
+From c2645c00b53107473efcb954afb06bd6906a7b00 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Tue, 24 Jul 2018 17:10:31 +0800
-Subject: [PATCH 38/65] support to get kickstart from network
+Date: Sat, 29 Jun 2019 14:25:21 +0800
+Subject: [PATCH] support to get kickstart from network
We support http/https/ftp protocol to get kickstart file
@@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/startup_utils.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
+ pyanaconda/startup_utils.py | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/startup_utils.py b/pyanaconda/startup_utils.py
-index e678f5b..cab54b4 100644
+index a0fca28..7b19c68 100644
--- a/pyanaconda/startup_utils.py
+++ b/pyanaconda/startup_utils.py
-@@ -475,8 +475,12 @@ def parse_kickstart(options, addon_paths, pass_to_boss=False):
+@@ -412,8 +412,11 @@ def parse_kickstart(options, addon_paths, pass_to_boss=False):
:returns: kickstart parsed to a data model
"""
ksdata = None
@@ -27,11 +27,10 @@ index e678f5b..cab54b4 100644
+ not options.ksfile.startswith("http://") and \
+ not options.ksfile.startswith("https://") and \
+ not options.ksfile.startswith("ftp://"):
-+
stdout_log.error("Kickstart file %s is missing.", options.ksfile)
util.ipmi_report(constants.IPMI_ABORTED)
sys.exit(1)
-@@ -494,8 +498,12 @@ def parse_kickstart(options, addon_paths, pass_to_boss=False):
+@@ -431,8 +434,12 @@ def parse_kickstart(options, addon_paths, pass_to_boss=False):
ks_files = ["/tmp/updates/interactive-defaults.ks",
"/usr/share/anaconda/interactive-defaults.ks"]