aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-installer
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-installer')
-rw-r--r--recipes-installer/anaconda/files/0051-always-write-fstab-after-install.patch33
1 files changed, 18 insertions, 15 deletions
diff --git a/recipes-installer/anaconda/files/0051-always-write-fstab-after-install.patch b/recipes-installer/anaconda/files/0051-always-write-fstab-after-install.patch
index 7b521e8..08abd93 100644
--- a/recipes-installer/anaconda/files/0051-always-write-fstab-after-install.patch
+++ b/recipes-installer/anaconda/files/0051-always-write-fstab-after-install.patch
@@ -1,31 +1,34 @@
-From 7e7d9ac3f238303e71060d47ccdd87aeba96cf96 Mon Sep 17 00:00:00 2001
+From 1dc4c484520fd34f0db971bd7158dc60ce6e7a50 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Wed, 25 Jul 2018 17:35:33 +0800
-Subject: [PATCH 51/65] always write fstab after install
+Date: Sat, 29 Jun 2019 16:22:36 +0800
+Subject: [PATCH] always write fstab after install
-Override writeStorageEarly with pass, and run writeStorageLate
-always writes fstab after instal, make sure the generated
+We should write the storage after doing the installation
+which always writes fstab after instal, make sure the generated
/etc/fstab not overwritten by the one from package install.
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/payload/dnfpayload.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ pyanaconda/payload/dnfpayload.py | 5 -----
+ 1 file changed, 5 deletions(-)
diff --git a/pyanaconda/payload/dnfpayload.py b/pyanaconda/payload/dnfpayload.py
-index afff294..342c878 100644
+index 512f217..cd6b209 100644
--- a/pyanaconda/payload/dnfpayload.py
+++ b/pyanaconda/payload/dnfpayload.py
-@@ -1361,7 +1361,7 @@ class DNFPayload(payload.PackagePayload):
- ["-a"],
- root=util.getSysroot())
-
-- def writeStorageLate(self):
-+ def writeStorageEarly(self):
- pass
+@@ -1485,11 +1485,6 @@ class DNFPayload(payload.PackagePayload):
+ if ks_repo.excludepkgs:
+ f.write("exclude=%s\n" % ",".join(ks_repo.excludepkgs))
+- @property
+- def needs_storage_configuration(self):
+- """Should we write the storage before doing the installation?"""
+- return True
+-
+ def post_setup(self):
+ """Perform post-setup tasks.
--
2.7.4