summaryrefslogtreecommitdiff
path: root/configs/baseline
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-07-06 00:36:46 -0400
committerDavid P <megver83@parabola.nu>2021-07-06 02:22:21 -0400
commit50b2b4e56aa6f6dfaff61d7fcfa5da3ecad87167 (patch)
tree2c4edef354ba653658f387c85001e6e039b576f8 /configs/baseline
parent47dd6e46e5bb03f6968d5f34e12434d0007c702e (diff)
sync with archiso v55v55
Imported changes: 0bc6294 (tag: v55) Merge branch 'changelog/55' 5751de9 Add changelog for v55 50c5a02 Merge branch 'mr/118' d3b06a0 Add pv to the list of releng packages ef9207d Merge remote-tracking branch 'nl6720/baseline-erofs' 0b94b04 configs/baseline: use EROFS based image 85c7cbe Merge remote-tracking branch 'nl6720/networkd-replace-type-with-name' 3b2618f configs/releng/airootfs/etc/systemd/network/: match by globbing the interface name instead of matching the type 254194a Merge branch 'issues/135' 0e61ed0 Adjust documentation on IRC support channel e3a7f02 Merge remote-tracking branch 'sxw/copytoram' 31427ec Apply copytoram Boot Option Menu Entries also to releng 15f4ef4 Fence add_binary for pv 9c783a8 Reorder UEFI boot menu entries 16742d1 Update README.bootparams c9cdb6d Apply 1 suggestion(s) to 1 file(s) bb503b9 add optional pv tool Parabola changes: * mkparabolaiso: fix _run_once function Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/baseline')
-rw-r--r--configs/baseline/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf (renamed from configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf)0
-rw-r--r--configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf7
-rw-r--r--configs/baseline/efiboot/loader/loader.conf2
-rw-r--r--configs/baseline/packages.x86_641
-rw-r--r--configs/baseline/profiledef.sh4
-rw-r--r--configs/baseline/syslinux/syslinux-linux-libre.cfg6
6 files changed, 17 insertions, 3 deletions
diff --git a/configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf b/configs/baseline/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf
index 99bc0be..99bc0be 100644
--- a/configs/baseline/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf
+++ b/configs/baseline/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf
diff --git a/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf b/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf
new file mode 100644
index 0000000..4fc2c2c
--- /dev/null
+++ b/configs/baseline/efiboot/loader/entries/02-parabolaiso-x86_64-ram-linux-libre.conf
@@ -0,0 +1,7 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+title Parabola GNU/Linux-libre (x86_64, UEFI) Copy to RAM
+linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/baseline/efiboot/loader/loader.conf b/configs/baseline/efiboot/loader/loader.conf
index 99b52a9..02f2fd0 100644
--- a/configs/baseline/efiboot/loader/loader.conf
+++ b/configs/baseline/efiboot/loader/loader.conf
@@ -2,4 +2,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later
timeout 3
-default parabolaiso-x86_64-linux-libre.conf
+default 01-parabolaiso-x86_64-linux-libre.conf
diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64
index e9ab88d..25cc1e4 100644
--- a/configs/baseline/packages.x86_64
+++ b/configs/baseline/packages.x86_64
@@ -6,5 +6,6 @@ linux-libre
mkinitcpio
mkinitcpio-parabolaiso
openssh
+pv
qemu-guest-agent
syslinux
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index f5b3ae5..19b003a 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -11,8 +11,8 @@ buildmodes=('iso')
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
-airootfs_image_type="squashfs"
-airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
+airootfs_image_type="erofs"
+airootfs_image_tool_options=('-zlz4hc,12')
file_permissions=(
["/etc/shadow"]="0:0:400"
)
diff --git a/configs/baseline/syslinux/syslinux-linux-libre.cfg b/configs/baseline/syslinux/syslinux-linux-libre.cfg
index 056be58..13c4a20 100644
--- a/configs/baseline/syslinux/syslinux-linux-libre.cfg
+++ b/configs/baseline/syslinux/syslinux-linux-libre.cfg
@@ -6,3 +6,9 @@ MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS)
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-libre
INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-libre.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
+
+LABEL parabola-ram
+MENU LABEL Parabola GNU/Linux-libre (x86_64, BIOS) Copy to RAM
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-libre
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-libre.img
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram