revert tmpfs for /, it breaks kexec boot <4GB

This commit is contained in:
Tobias Powalowski 2022-05-23 21:43:44 +02:00
parent a5f036984b
commit 78d70d2edc
4 changed files with 10 additions and 13 deletions

View file

@ -340,6 +340,11 @@ _prepare_x() {
locale-gen >/dev/null 2>&1 locale-gen >/dev/null 2>&1
echo "Cleanup locale and i18n ..." echo "Cleanup locale and i18n ..."
rm -rf /usr/share/{locale,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() { _chromium_flags() {

View file

@ -28,7 +28,7 @@ build ()
### adding needed files from running system ### adding needed files from running system
add_symlink "/etc/mtab" "/proc/self/mounts" add_symlink "/etc/mtab" "/proc/self/mounts"
map add_full_dir "/etc/profile.d" "/usr/share/terminfo" 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 \ nanorc nsswitch.conf protocols request-key.conf resolv.conf securetty \
services wgetrc" services wgetrc"
for i in $systemfiles; do for i in $systemfiles; do
@ -37,7 +37,7 @@ build ()
### adding config files of installation system ### adding config files of installation system
map add_file "/etc/profile" "/etc/group" "/etc/gshadow" 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 for i in $basic_config; do
add_file "/usr/share/archboot/base/etc/$i" "/etc/$i" add_file "/usr/share/archboot/base/etc/$i" "/etc/$i"
done done

View file

@ -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

View file

@ -96,7 +96,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux x86_64 Archboot" { menuentry "Arch Linux x86_64 Archboot" {
set gfxpayload=keep set gfxpayload=keep
_menu_running _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 _initrd_x86_64
} }
@ -110,7 +110,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux AA64 Archboot" { menuentry "Arch Linux AA64 Archboot" {
set gfxpayload=keep set gfxpayload=keep
_menu_running _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 _initrd_aarch64
} }
@ -123,7 +123,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" { menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" {
set gfxpayload=keep set gfxpayload=keep
_menu_running _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 _initrd_x86_64
} }