From de0566323f35d5384f08fc04c1aae3a481295b88 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 16 Aug 2018 13:01:01 +0100 Subject: [PATCH] core124: Ship EFI changes Signed-off-by: Michael Tremer --- config/rootfiles/core/124/filelists/aarch64/efibootmgr | 1 + config/rootfiles/core/124/filelists/aarch64/efivar | 1 + config/rootfiles/core/124/filelists/aarch64/grub | 1 + config/rootfiles/core/124/filelists/cdrkit | 1 + config/rootfiles/core/124/filelists/files | 3 +++ config/rootfiles/core/124/filelists/i586/grub | 1 + config/rootfiles/core/124/filelists/parted | 1 + config/rootfiles/core/124/filelists/x86_64/efibootmgr | 1 + config/rootfiles/core/124/filelists/x86_64/efivar | 1 + config/rootfiles/core/124/filelists/x86_64/grub | 1 + config/rootfiles/core/124/update.sh | 5 +++++ 11 files changed, 17 insertions(+) create mode 120000 config/rootfiles/core/124/filelists/aarch64/efibootmgr create mode 120000 config/rootfiles/core/124/filelists/aarch64/efivar create mode 120000 config/rootfiles/core/124/filelists/aarch64/grub create mode 120000 config/rootfiles/core/124/filelists/cdrkit create mode 120000 config/rootfiles/core/124/filelists/i586/grub create mode 120000 config/rootfiles/core/124/filelists/parted create mode 120000 config/rootfiles/core/124/filelists/x86_64/efibootmgr create mode 120000 config/rootfiles/core/124/filelists/x86_64/efivar create mode 120000 config/rootfiles/core/124/filelists/x86_64/grub diff --git a/config/rootfiles/core/124/filelists/aarch64/efibootmgr b/config/rootfiles/core/124/filelists/aarch64/efibootmgr new file mode 120000 index 0000000000..55970e1dd9 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/efibootmgr @@ -0,0 +1 @@ +../../../../common/aarch64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/efivar b/config/rootfiles/core/124/filelists/aarch64/efivar new file mode 120000 index 0000000000..8a3b708b98 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/efivar @@ -0,0 +1 @@ +../../../../common/aarch64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/aarch64/grub b/config/rootfiles/core/124/filelists/aarch64/grub new file mode 120000 index 0000000000..40ae85fb60 --- /dev/null +++ b/config/rootfiles/core/124/filelists/aarch64/grub @@ -0,0 +1 @@ +../../../../common/aarch64/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/cdrkit b/config/rootfiles/core/124/filelists/cdrkit new file mode 120000 index 0000000000..89c6f6ca15 --- /dev/null +++ b/config/rootfiles/core/124/filelists/cdrkit @@ -0,0 +1 @@ +../../../common/cdrkit \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 32669a2eca..3d5b8a0a9f 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -1,4 +1,7 @@ etc/system-release etc/issue etc/rc.d/init.d/localnet +etc/rc.d/init.d/partresize +usr/bin/install-bootloader +usr/local/bin/backupiso var/ipfire/langs diff --git a/config/rootfiles/core/124/filelists/i586/grub b/config/rootfiles/core/124/filelists/i586/grub new file mode 120000 index 0000000000..feb236a224 --- /dev/null +++ b/config/rootfiles/core/124/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/parted b/config/rootfiles/core/124/filelists/parted new file mode 120000 index 0000000000..89195d8e89 --- /dev/null +++ b/config/rootfiles/core/124/filelists/parted @@ -0,0 +1 @@ +../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/efibootmgr b/config/rootfiles/core/124/filelists/x86_64/efibootmgr new file mode 120000 index 0000000000..d6964dba96 --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/efibootmgr @@ -0,0 +1 @@ +../../../../common/x86_64/efibootmgr \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/efivar b/config/rootfiles/core/124/filelists/x86_64/efivar new file mode 120000 index 0000000000..994ea5e1b3 --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/efivar @@ -0,0 +1 @@ +../../../../common/x86_64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/124/filelists/x86_64/grub b/config/rootfiles/core/124/filelists/x86_64/grub new file mode 120000 index 0000000000..78d3bd7840 --- /dev/null +++ b/config/rootfiles/core/124/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index 068fc4c61b..966eb2b12a 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -47,6 +47,11 @@ ldconfig # rebuild initrd to add early microcode updates rebuild-initrd +# Remove deprecated GRUB configuration option +if [ -e "/etc/default/grub" ]; then + sed -e "/^GRUB_FONT/d" -i /etc/default/grub +fi + # This update needs a reboot... #touch /var/run/need_reboot -- 2.39.2