aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-07-11 05:15:13 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-11 17:21:49 +0800
commitc51043a5fe20051bed5b745eeac57a99c0c8ef3e (patch)
treea4e5cf376b0829c8cb391d4fe0e240c20d0f98c5
parent859d860d788344492419f2ebba5e87f2a6d62c63 (diff)
downloadmeta-anaconda-c51043a5fe20051bed5b745eeac57a99c0c8ef3e.tar.gz
meta-anaconda-c51043a5fe20051bed5b745eeac57a99c0c8ef3e.tar.bz2
meta-anaconda-c51043a5fe20051bed5b745eeac57a99c0c8ef3e.zip
python3-anaconda: update 0040-support-downloading-file-from-http-ftp-server-to-tar.patch
Download files after os, user configuration Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0040-support-downloading-file-from-http-ftp-server-to-tar.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-installer/anaconda/files/0040-support-downloading-file-from-http-ftp-server-to-tar.patch b/recipes-installer/anaconda/files/0040-support-downloading-file-from-http-ftp-server-to-tar.patch
index 236a4bb..9b43dba 100644
--- a/recipes-installer/anaconda/files/0040-support-downloading-file-from-http-ftp-server-to-tar.patch
+++ b/recipes-installer/anaconda/files/0040-support-downloading-file-from-http-ftp-server-to-tar.patch
@@ -1,4 +1,4 @@
-From 7c7a6e75fe96dfcc53f18a90dcd4e3f5ced7cea8 Mon Sep 17 00:00:00 2001
+From 4c891449e324d3a78ddf7722fd7805bae2e1cbfb Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 29 Jun 2019 15:06:40 +0800
Subject: [PATCH] support downloading file from http/ftp server to target image
@@ -24,17 +24,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2 files changed, 100 insertions(+)
diff --git a/pyanaconda/installation.py b/pyanaconda/installation.py
-index 0423a3d..a7a1d88 100644
+index 0423a3d..fa5bfc8 100644
--- a/pyanaconda/installation.py
+++ b/pyanaconda/installation.py
-@@ -101,6 +101,7 @@ def doConfiguration(storage, payload, ksdata):
- os_config.append(Task("Configure timezone", ksdata.timezone.execute))
- os_config.append(Task("Configure language", ksdata.lang.execute))
- os_config.append(Task("Configure X", ksdata.xconfig.execute))
-+ os_config.append(Task("Configure download", ksdata.download.execute, (ksdata,)))
- configuration_queue.append(os_config)
+@@ -122,6 +122,7 @@ def doConfiguration(storage, payload, ksdata):
+ # Anaconda addon configuration
+ addon_config = TaskQueue("Anaconda addon configuration", N_("Configuring addons"))
+ addon_config.append(Task("Configure Anaconda addons", ksdata.addons.execute, (storage, ksdata, u, payload)))
++ addon_config.append(Task("Configure download", ksdata.download.execute, (ksdata,)))
+ configuration_queue.append(addon_config)
- # schedule network configuration (if required)
+ # Initramfs generation
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 5108a5a..5f8a050 100644
--- a/pyanaconda/kickstart.py