summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2021-02-23 09:00:43 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2021-02-23 09:04:17 +0000
commit6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de (patch)
tree39c8b808582b846300abb288b61b1279cf09a9eb
parentcccb5a26060c75a97a2aa75f38edd2b6782d6615 (diff)
downloaddrakiso-6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de.tar
drakiso-6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de.tar.gz
drakiso-6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de.tar.bz2
drakiso-6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de.tar.xz
drakiso-6bfebc5af47dbd1a5bd0f0b437b758cdd15fc9de.zip
Change ESP label from MGALIVE-ESP to MGAISO-ESP (mga#28409).
-rw-r--r--NEWS2
-rw-r--r--lib/MGA/DrakISO/BuildBoot.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e21b346..72d0cb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- change ESP label to MGAISO-ESP (mga#28409)
+
1.17
- bootloader:
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index 861f56a..83f158c 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -273,7 +273,7 @@ sub prepare_iso_bootloader {
# Give it a label, to try to work around mga#23939.
my $esp_image = $images_dir . '/esp.img';
eval { rm_rf($esp_image) };
- run_('/sbin/mkdosfs', '-n', 'MGALIVE-ESP', '-F12', '-C', $esp_image, '4096');
+ run_('/sbin/mkdosfs', '-n', 'MGAISO-ESP', '-F12', '-C', $esp_image, '4096');
run_('mcopy', '-s', '-i', $esp_image, $efi_root_dir, '::');
# Now we've built the ESP image, we can delete the grub2 image. We need