core124: Ship EFI changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/124/filelists/aarch64/efibootmgr b/config/rootfiles/core/124/filelists/aarch64/efibootmgr
new file mode 120000 (symlink)
index 0000000..55970e1
--- /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 (symlink)
index 0000000..8a3b708
--- /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 (symlink)
index 0000000..40ae85f
--- /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 (symlink)
index 0000000..89c6f6c
--- /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 32669a2eca472a32b1b2b25dcdea4f6d9649d28d..3d5b8a0a9fd315a5b55f01c748a7526881feefef 100644 (file)
--- 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 (symlink)
index 0000000..feb236a
--- /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 (symlink)
index 0000000..89195d8
--- /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 (symlink)
index 0000000..d6964db
--- /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 (symlink)
index 0000000..994ea5e
--- /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 (symlink)
index 0000000..78d3bd7
--- /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 068fc4c61b712821adbace212726893510954e1c..966eb2b12a9c77d26386568d8026fcd3ca6cbe27 100644 (file)
--- 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