From 78d70d2edc93de23839f58639c3c6e9d5ebd9107 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 23 May 2022 21:43:44 +0200
Subject: [PATCH] revert tmpfs for /, it breaks kexec boot <4GB

---
 usr/lib/archboot/update-installer.sh           | 5 +++++
 usr/lib/initcpio/install/archboot_base_common  | 4 ++--
 usr/share/archboot/base/etc/fstab              | 8 --------
 usr/share/archboot/grub/archboot-main-grub.cfg | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 usr/share/archboot/base/etc/fstab

diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh
index fdc4d4c10..8dcc246b2 100644
--- a/usr/lib/archboot/update-installer.sh
+++ b/usr/lib/archboot/update-installer.sh
@@ -340,6 +340,11 @@ _prepare_x() {
     locale-gen >/dev/null 2>&1
     echo "Cleanup locale and i18n ..."
     rm -rf /usr/share/{locale,i18n}
+    # needed for environments which check disk space
+    if ! mountpoint /root; then
+        echo "Mount tmpfs on /root"
+        mount -t tmpfs tmpfs /root
+    fi
 }
 
 _chromium_flags() {
diff --git a/usr/lib/initcpio/install/archboot_base_common b/usr/lib/initcpio/install/archboot_base_common
index 484cc41cc..9d4eff6c5 100644
--- a/usr/lib/initcpio/install/archboot_base_common
+++ b/usr/lib/initcpio/install/archboot_base_common
@@ -28,7 +28,7 @@ build ()
     ### adding needed files from running system
     add_symlink "/etc/mtab" "/proc/self/mounts"
     map add_full_dir "/etc/profile.d" "/usr/share/terminfo"
-    systemfiles="bash.bash_logout crypttab host.conf hosts inputrc mke2fs.conf \
+    systemfiles="bash.bash_logout crypttab fstab host.conf hosts inputrc mke2fs.conf \
                  nanorc nsswitch.conf protocols request-key.conf resolv.conf securetty \
                  services wgetrc"
     for i in $systemfiles; do
@@ -37,7 +37,7 @@ build ()
 
     ### adding config files of installation system
     map add_file "/etc/profile" "/etc/group" "/etc/gshadow"
-    basic_config="bash.bashrc fstab hostname modprobe.d/modprobe.conf passwd shadow shells"
+    basic_config="bash.bashrc hostname modprobe.d/modprobe.conf passwd shadow shells"
     for i in $basic_config; do
         add_file "/usr/share/archboot/base/etc/$i" "/etc/$i"
     done
diff --git a/usr/share/archboot/base/etc/fstab b/usr/share/archboot/base/etc/fstab
deleted file mode 100644
index 19e2fa5ea..000000000
--- a/usr/share/archboot/base/etc/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
-# 
-# /etc/fstab: static file system information
-#
-# <file system>	<dir>	<type>	<options>	<dump>	<pass>
-# allow checkspace on /
-tmpfs / ramfs defaults,size=100% 0 0
-
-
diff --git a/usr/share/archboot/grub/archboot-main-grub.cfg b/usr/share/archboot/grub/archboot-main-grub.cfg
index 45ffa67be..d707941f9 100644
--- a/usr/share/archboot/grub/archboot-main-grub.cfg
+++ b/usr/share/archboot/grub/archboot-main-grub.cfg
@@ -96,7 +96,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux x86_64 Archboot" {
             set gfxpayload=keep
             _menu_running
-            linux /boot/vmlinuz_x86_64 console=ttyS0,115200 console=tty0
+            linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
             _initrd_x86_64
         }
         
@@ -110,7 +110,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux AA64 Archboot" {
             set gfxpayload=keep
             _menu_running
-            linux /boot/vmlinuz_aarch64 nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4
+            linux /boot/vmlinuz_aarch64 rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4
             _initrd_aarch64
         }
         
@@ -123,7 +123,7 @@ if [ ${grub_platform} == "efi" ]; then
         menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" {
                 set gfxpayload=keep
                 _menu_running
-                linux /boot/vmlinuz_x86_64 _IA32_UEFI=1 console=ttyS0,115200 console=tty0
+                linux /boot/vmlinuz_x86_64 rootfstype=ramfs _IA32_UEFI=1 console=ttyS0,115200 console=tty0
                 _initrd_x86_64
         }