no-change reorder of patches

0001-Add-ability-to-prevent-SELinux-relabelling-from-host.patch

@@ -1,7 +1,7 @@
-From 194e8e79054e5a81b3b632f886f4ab5aa8a6a93b Mon Sep 17 00:00:00 2001
+From 391593c78ebaec410b2bbbcd947d85f26625fa07 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 17 May 2020 15:20:28 +0300
-Subject: [PATCH 01/10] Add ability to prevent SELinux relabelling from host
+Subject: [PATCH 01/12] Add ability to prevent SELinux relabelling from host
 
 https://github.com/livecd-tools/livecd-tools/issues/156
 ---

0002-Add-livenet-and-anaconda-initrd-modules.patch

@@ -1,7 +1,7 @@
-From dac01a512e80f7b888aacbbb1cc8a7ac82861f4d Mon Sep 17 00:00:00 2001
+From 318cd4e23d9941f2f7a4cb57f2f9880dd71bb56f Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Thu, 28 May 2020 13:45:53 +0300
-Subject: [PATCH 02/10] Add livenet and anaconda initrd modules
+Subject: [PATCH 02/12] Add livenet and anaconda initrd modules
 
 We need livenet to be able to fetch squashfs images in PXE boots
 We need Anaconda module for fully functional Anaconda in similar use cases

0003-Copy-all-files-that-match-a-glob.patch

@@ -1,7 +1,7 @@
-From 0a8de4c658ad85d349cb611fbba75ff9148ce673 Mon Sep 17 00:00:00 2001
+From cb2269654631e4c52b83756313d1097704d130d5 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Thu, 28 May 2020 21:05:16 +0300
-Subject: [PATCH 03/10] Copy all files that match a glob
+Subject: [PATCH 03/12] Copy all files that match a glob
 
 We want to copy /boot/grub2/themes/rosa/*, which means all files inside /boot/grub2/themes/rosa/,
 but not only the first file. This patch restores behaviour of an older version of livecd-tools.

0004-Leave-etc-vconsole.conf-not-changed.patch

@@ -1,7 +1,7 @@
-From bafe5992f4df18ecd9b9b0d46cb18b4deb7d68d8 Mon Sep 17 00:00:00 2001
+From 675ebbc355382deb38fccae00408f915ff183061 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Fri, 29 May 2020 04:04:44 +0300
-Subject: [PATCH 04/10] Leave /etc/vconsole.conf not changed
+Subject: [PATCH 04/12] Leave /etc/vconsole.conf not changed
 
 1. eurlatgr font is not universal and does not cupport cyrillic characters
 https://github.com/livecd-tools/livecd-tools/issues/159

0005-Off-sss-hack.patch

@@ -1,7 +1,7 @@
-From 2c91ed3527c826409d75f9f7b4be064bc0a53afd Mon Sep 17 00:00:00 2001
+From 6f46c1d322484037ef86d005084622995b860d76 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Mon, 29 Jun 2020 12:23:45 +0300
-Subject: [PATCH 05/10] Off sss hack
+Subject: [PATCH 05/12] Off sss hack
 
 History of this hack:
 https://bugzilla.redhat.com/show_bug.cgi?id=1127103

0006-Do-not-check-for-installed-packages-they-are-pulled-.patch

@@ -1,7 +1,7 @@
-From d4da802d949b1b4bc046a03df0555f8674f9187b Mon Sep 17 00:00:00 2001
+From a3fc0865ceed29dce940d0adce3f8c049ed1005b Mon Sep 17 00:00:00 2001
 From: Andrey Grigorev <survolog@yandex.ru>
 Date: Sat, 26 Jun 2021 14:35:15 +0300
-Subject: [PATCH 06/10] Do not check for installed packages, they are pulled as
+Subject: [PATCH 06/12] Do not check for installed packages, they are pulled as
  Requires of livecd-tools
 
 ---

0007-Adapt-Grub-and-Shim-paths-for-ROSA.patch

@@ -1,7 +1,7 @@
-From e7feb8f2d4fd90ba8da751a93c2ee3aa7fda4147 Mon Sep 17 00:00:00 2001
+From ea28099fff52b8af6f751479e0196d65579cb129 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 27 Jun 2021 12:03:18 +0300
-Subject: [PATCH 07/10] Adapt Grub and Shim paths for ROSA
+Subject: [PATCH 07/12] Adapt Grub and Shim paths for ROSA
 
 grubcd.efi: the efi image used for optial disk booting, with reduced size and $prefix set to /EFI/BOOT
 ---

0008-Fix-name-of-x86_64-bootloader-according-to-UEFI-spec.patch

@@ -1,7 +1,7 @@
-From 007b87bab26994a6dfe421b031194191a48a0f3a Mon Sep 17 00:00:00 2001
+From f14c853aa3c022e7e5e1ff35fc64fbf739e61dd3 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 27 Jun 2021 15:54:00 +0300
-Subject: [PATCH 08/10] Fix name of x86_64 bootloader according to UEFI spec
+Subject: [PATCH 08/12] Fix name of x86_64 bootloader according to UEFI spec
 
 ---
  imgcreate/live.py | 7 ++++++-

0009-Fix-check-if-EFI-bootloader-exists.patch

@@ -1,7 +1,7 @@
-From 47b3f2fc78d89779b11710b7af9936f3160aad9f Mon Sep 17 00:00:00 2001
+From 11de1563f4cf3f84c94c0bba75217aa94d4f3018 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 27 Jun 2021 16:42:50 +0300
-Subject: [PATCH 09/10] Fix check if EFI bootloader exists
+Subject: [PATCH 09/12] Fix check if EFI bootloader exists
 
 A path of initial location before copying files to the isodir was checked.
 Let's better check the real location which will be fed to mkefiboot bellow.

0010-mkdir-isolinux-on-aarch64.patch

@@ -1,7 +1,7 @@
-From 3966b15580df45a73340d2b327735d61c2ff5e24 Mon Sep 17 00:00:00 2001
+From a4432e9a4465b92a2261b2deeb45e3bec0873168 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 27 Jun 2021 18:38:10 +0300
-Subject: [PATCH] mkdir isolinux on aarch64
+Subject: [PATCH 10/12] mkdir isolinux on aarch64
 
 It was made on x86 (just because ISOs are made made for both EFI and non-EFI) but was not in aarch64
 This duplication of code looks ugly but I don't know how to make it better
@@ -10,10 +10,10 @@ This duplication of code looks ugly but I don't know how to make it better
  1 file changed, 1 insertion(+)
 
 diff --git a/imgcreate/live.py b/imgcreate/live.py
-index 5d20aca..8521f50 100644
+index 233c9ff..e06450d 100644
 --- a/imgcreate/live.py
 +++ b/imgcreate/live.py
-@@ -1187,6 +1187,7 @@ submenu 'Troubleshooting -->' {
+@@ -1191,6 +1191,7 @@ submenu 'Troubleshooting -->' {
  
      def _configure_efi_bootloader(self, isodir):
          """Set up the configuration for an EFI bootloader"""

0011-Fix-missync-of-locations-of-efiboot.img.patch

@@ -1,7 +1,7 @@
-From 1233c0a8e4890dc5f22b500db7c0d4a6d9b21ff9 Mon Sep 17 00:00:00 2001
+From b9cc0a811c2dff5a610c90e3ceb2170d8442c2ab Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Sun, 27 Jun 2021 20:35:24 +0300
-Subject: [PATCH] Fix missync of locations of efiboot.img
+Subject: [PATCH 11/12] Fix missync of locations of efiboot.img
 
 Fixes: f5d76fa3748 ("place efiboot.img and macboot.img in /isolinux")
 That commit forgot to change "images" to "isolinux" for aarch64.
@@ -10,10 +10,10 @@ That commit forgot to change "images" to "isolinux" for aarch64.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/imgcreate/live.py b/imgcreate/live.py
-index 708325c..d4afe58 100644
+index e06450d..cf66f50 100644
 --- a/imgcreate/live.py
 +++ b/imgcreate/live.py
-@@ -1051,8 +1051,8 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
+@@ -1046,8 +1046,8 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
  
      def _get_xorrisofs_options(self, isodir):
          options = []

0012-ROSA-theme-and-config-of-bootloaders.patch

@@ -1,7 +1,7 @@
-From a92ff240fd431e7212b8c53e54fd3859ca94e83d Mon Sep 17 00:00:00 2001
+From f2d34e4f2b806ef3b7596a4ec9782a4d17de6f41 Mon Sep 17 00:00:00 2001
 From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
 Date: Thu, 28 May 2020 14:40:47 +0300
-Subject: [PATCH 10/10] ROSA theme and config of bootloaders
+Subject: [PATCH 12/12] ROSA theme and config of bootloaders
 
 * ROSA theme for syslinux
 * ROSA theme for grub2
@@ -16,7 +16,7 @@ Based on:
  1 file changed, 52 insertions(+), 47 deletions(-)
 
 diff --git a/imgcreate/live.py b/imgcreate/live.py
-index 233c9ff..b0162ad 100644
+index cf66f50..d4afe58 100644
 --- a/imgcreate/live.py
 +++ b/imgcreate/live.py
 @@ -115,7 +115,7 @@ class LiveImageCreatorBase(LoopImageCreator):

livecd-tools.spec

@@ -31,11 +31,11 @@ Patch0007: 0007-Adapt-Grub-and-Shim-paths-for-ROSA.patch
 Patch0008: 0008-Fix-name-of-x86_64-bootloader-according-to-UEFI-spec.patch
 # https://github.com/livecd-tools/livecd-tools/pull/196
 Patch0009: 0009-Fix-check-if-EFI-bootloader-exists.patch
-Patch0010: 0010-ROSA-theme-and-config-of-bootloaders.patch
 # https://github.com/livecd-tools/livecd-tools/pull/198
-Patch0011: 0011-mkdir-isolinux-on-aarch64.patch
+Patch0010: 0010-mkdir-isolinux-on-aarch64.patch
 # https://github.com/livecd-tools/livecd-tools/pull/197
-Patch0012: 0012-Fix-missync-of-locations-of-efiboot.img.patch
+Patch0011: 0011-Fix-missync-of-locations-of-efiboot.img.patch
+Patch0012: 0012-ROSA-theme-and-config-of-bootloaders.patch
 
 BuildRequires: python3-devel
 # pod2man comes from perl