summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-28 16:44:20 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-05-23 18:31:00 +0100
commit4cfe467c9cb86e7604d2bad0082133282938f117 (patch)
treeda8d581e6ad0a0e12b04f32e2a27386404ed2086
parent2020a1189da019f033693b416c67a342d7a9adfb (diff)
downloaddrakiso-4cfe467c9cb86e7604d2bad0082133282938f117.tar
drakiso-4cfe467c9cb86e7604d2bad0082133282938f117.tar.gz
drakiso-4cfe467c9cb86e7604d2bad0082133282938f117.tar.bz2
drakiso-4cfe467c9cb86e7604d2bad0082133282938f117.tar.xz
drakiso-4cfe467c9cb86e7604d2bad0082133282938f117.zip
Change install directory for bootloader files.
-rw-r--r--bootloader/Makefile2
-rw-r--r--examples/gui/config/build.cfg16
-rw-r--r--examples/minimal/config/build.cfg18
-rw-r--r--examples/xfce/config/build.cfg16
4 files changed, 26 insertions, 26 deletions
diff --git a/bootloader/Makefile b/bootloader/Makefile
index f625342..00db3ea 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -16,7 +16,7 @@ else
GRUB_IMAGES += images/bootia32.efi
endif
-INSTALL_DIR = $(PREFIX)/usr/share/drakiso-bootloader
+INSTALL_DIR = $(PREFIX)/usr/share/drakiso/bootloader
all: $(MY_TARGETS) po
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index aa05626..83f2e8a 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -181,10 +181,10 @@ my $config = {
media => {
label => build_label($build),
bootloader_title => build_title($build),
- bootloader_theme => '/usr/share/drakiso-bootloader/maggy',
- bootloader_font => '/usr/share/drakiso-bootloader/unicode.pf2',
- bootloader_langs => '/usr/share/drakiso-bootloader/lang-names.txt',
- bootloader_messages => '/usr/share/drakiso-bootloader/messages',
+ bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
+ bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
+ bootloader_langs => '/usr/share/drakiso/bootloader/lang-names.txt',
+ bootloader_messages => '/usr/share/drakiso/bootloader/messages',
bootloader_default => 0,
bootloader_timeout => 10,
bootloader_entries => [
@@ -194,15 +194,15 @@ my $config = {
' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
- mbr_boot_img => '/usr/share/drakiso-bootloader/images/boot_hybrid.img',
- eltorito_img => '/usr/share/drakiso-bootloader/images/eltorito.img',
+ mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img',
+ eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img',
if_($arch eq 'i586',
efi_type => '32bit',
- boot32_efi => '/usr/share/drakiso-bootloader/images/bootia32.efi'
+ boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi'
),
if_($arch eq 'x86_64',
efi_type => '64bit',
- boot64_efi => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+ boot64_efi => '/usr/share/drakiso/bootloader/images/bootx64.efi'
),
copy_from_repo => [
'isolinux/memtest' => 'boot/memtest',
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index d2bf5fc..4bc899d 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -157,26 +157,26 @@ my $config = {
media => {
label => build_label($build),
bootloader_title => build_title($build),
- bootloader_theme => '/usr/share/drakiso-bootloader/maggy',
- bootloader_font => '/usr/share/drakiso-bootloader/unicode.pf2',
- bootloader_langs => '/usr/share/drakiso-bootloader/lang-names.txt',
- bootloader_kbds => '/usr/share/drakiso-bootloader/kbd-names.txt',
- bootloader_messages => '/usr/share/drakiso-bootloader/messages',
+ bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
+ bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
+ bootloader_langs => '/usr/share/drakiso/bootloader/lang-names.txt',
+ bootloader_kbds => '/usr/share/drakiso/bootloader/kbd-names.txt',
+ bootloader_messages => '/usr/share/drakiso/bootloader/messages',
bootloader_default => 0,
bootloader_timeout => 10,
bootloader_entries => [
'Boot Mageia Live' => { append => $default_append . ' xdriver=free' },
'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
- mbr_boot_img => '/usr/share/drakiso-bootloader/images/boot_hybrid.img',
- eltorito_img => '/usr/share/drakiso-bootloader/images/eltorito.img',
+ mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img',
+ eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img',
if_($arch eq 'i586',
efi_type => '32bit',
- boot32_efi => '/usr/share/drakiso-bootloader/images/bootia32.efi'
+ boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi'
),
if_($arch eq 'x86_64',
efi_type => '64bit',
- boot64_efi => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+ boot64_efi => '/usr/share/drakiso/bootloader/images/bootx64.efi'
),
copy_from_repo => [
'isolinux/memtest' => 'boot/memtest',
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index cc871c1..3e22d76 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -229,10 +229,10 @@ my $config = {
media => {
label => build_label($build),
bootloader_title => build_title($build),
- bootloader_theme => '/usr/share/drakiso-bootloader/maggy',
- bootloader_font => '/usr/share/drakiso-bootloader/unicode.pf2',
- bootloader_langs => '/usr/share/drakiso-bootloader/lang-names.txt',
- bootloader_messages => '/usr/share/drakiso-bootloader/messages',
+ bootloader_theme => '/usr/share/drakiso/bootloader/maggy',
+ bootloader_font => '/usr/share/drakiso/bootloader/unicode.pf2',
+ bootloader_langs => '/usr/share/drakiso/bootloader/lang-names.txt',
+ bootloader_messages => '/usr/share/drakiso/bootloader/messages',
bootloader_default => 0,
bootloader_timeout => 10,
bootloader_entries => [
@@ -242,15 +242,15 @@ my $config = {
' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
- mbr_boot_img => '/usr/share/drakiso-bootloader/images/boot_hybrid.img',
- eltorito_img => '/usr/share/drakiso-bootloader/images/eltorito.img',
+ mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img',
+ eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img',
if_($arch eq 'i586',
efi_type => '32bit',
- boot32_efi => '/usr/share/drakiso-bootloader/images/bootia32.efi'
+ boot32_efi => '/usr/share/drakiso/bootloader/images/bootia32.efi'
),
if_($arch eq 'x86_64',
efi_type => '64bit',
- boot64_efi => '/usr/share/drakiso-bootloader/images/bootx64.efi'
+ boot64_efi => '/usr/share/drakiso/bootloader/images/bootx64.efi'
),
copy_from_repo => [
'isolinux/memtest' => 'boot/memtest',