aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-06-28 23:59:45 -0400
committerHongxu Jia <hongxu.jia@windriver.com>2019-07-06 11:29:47 +0800
commitc9ac4b9f46bafa459d109f7a4f8e15363592bc8f (patch)
treecf6ed99ad63382b5eb1ac3aeac0d7b28c56a93e4
parentf0efe9a870f3daae2121eb56b5cb7dd3f9a6530e (diff)
downloadmeta-anaconda-c9ac4b9f46bafa459d109f7a4f8e15363592bc8f.tar.gz
meta-anaconda-c9ac4b9f46bafa459d109f7a4f8e15363592bc8f.tar.bz2
meta-anaconda-c9ac4b9f46bafa459d109f7a4f8e15363592bc8f.zip
python3-anaconda re-organize local patch: rebase 0025-tweak-bootloader-fs-type.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--recipes-installer/anaconda/files/0025-tweak-bootloader-fs-type.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/recipes-installer/anaconda/files/0025-tweak-bootloader-fs-type.patch b/recipes-installer/anaconda/files/0025-tweak-bootloader-fs-type.patch
index aabbaf2..278cf70 100644
--- a/recipes-installer/anaconda/files/0025-tweak-bootloader-fs-type.patch
+++ b/recipes-installer/anaconda/files/0025-tweak-bootloader-fs-type.patch
@@ -1,7 +1,7 @@
-From cb78ff57d4938dcf1c19ee49f264a158255f06cd Mon Sep 17 00:00:00 2001
+From 8734cc1aa6e7730db0965cb1fa825b5acf7570a3 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 26 May 2017 14:51:26 +0800
-Subject: [PATCH 25/65] tweak bootloader fs type
+Date: Sat, 29 Jun 2019 11:59:38 +0800
+Subject: [PATCH] tweak bootloader fs type
Use ext2 as default fs of bootloader to workaround grub-probe
failure while e2fsprogs upgraded to 1.43
@@ -10,16 +10,16 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- pyanaconda/bootloader.py | 2 +-
+ pyanaconda/bootloader/grub2.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
-index 59922ce..acfce0a 100644
---- a/pyanaconda/bootloader.py
-+++ b/pyanaconda/bootloader.py
-@@ -1438,7 +1438,7 @@ class GRUB2(GRUB):
- if productName.startswith("Red Hat "): # pylint: disable=no-member
- return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
+diff --git a/pyanaconda/bootloader/grub2.py b/pyanaconda/bootloader/grub2.py
+index 352ad72..80b026a 100644
+--- a/pyanaconda/bootloader/grub2.py
++++ b/pyanaconda/bootloader/grub2.py
+@@ -186,7 +186,7 @@ class GRUB2(BootLoader):
+ if productName.startswith("Red Hat "): # pylint: disable=no-member
+ return ["xfs", "ext4", "ext3", "ext2"]
else:
- return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
+ return ["ext2", "ext3", "ext4", "btrfs", "xfs"]