diff options
| author | David P <megver83@parabola.nu> | 2021-07-06 00:36:46 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2021-07-06 02:22:21 -0400 |
| commit | 50b2b4e56aa6f6dfaff61d7fcfa5da3ecad87167 (patch) | |
| tree | 2c4edef354ba653658f387c85001e6e039b576f8 | |
| parent | 47dd6e46e5bb03f6968d5f34e12434d0007c702e (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>
36 files changed, 180 insertions, 19 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c6c3498..87f41b4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ######### +[55] - 2021-06-01 +================= + +Added +----- + +- Add integration for pv when using the copytoram boot parameter so that progress on copying the image to RAM is shown +- Add experimental support for EROFS by using it for the rootfs image in the baseline profile + +Changed +------- + +- Change information on IRC channel, as Parabola GNU/Linux-libre moved to Libera Chat +- Fix a regression, that would prevent network interfaces to be configured under certain circumstances +- Update releases maintainer information + [54] - 2021-05-13 ================= @@ -149,15 +149,15 @@ base. Discussion around parabolaiso takes place on the `dev mailing list <https://lists.parabola.nu/listinfo/dev>`_ and in `#parabola -<ircs://chat.freenode.net/parabola>`_ on `freenode.net <https://freenode.net/>`_. +<ircs://irc.libera.chat/parabola>`_ on `freenode.net <ircs://irc.libera.chat/>`_. All past and present authors of parabolaiso are listed in `AUTHORS <AUTHORS.rst>`_. Releases ======== -`Releases of parabolaiso <https://gitlab.com/Megver83/parabolaiso/-/tags>`_ are created by its current maintainer -`David P <https://gitlab.com/Megver83>`_. Tags are signed using the PGP key with the ID +`Releases of parabolaiso <https://git.parabola.nu/parabolaiso.git/refs/tags>`_ are created by its current maintainer +`David P <https://www.parabola.nu/people/hackers/#megver83>`_. Tags are signed using the PGP key with the ID ``6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78``. To verify a tag, first import the relevant PGP key: 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 diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf index b49dd6e..b49dd6e 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-speech-linux-libre.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf index 62167e7..62167e7 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-speech-linux-libre.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf diff --git a/configs/lxde-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf new file mode 100644 index 0000000..907169d --- /dev/null +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf @@ -0,0 +1,8 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)" { + loader /%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/lxde-openrc/efiboot/EFI/BOOT/refind.conf b/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf index 075bf3f..9a59f11 100644 --- a/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/lxde-openrc/efiboot/EFI/BOOT/refind.conf @@ -5,6 +5,7 @@ scanfor manual showtools shell firmware reboot shutdown timeout 15 -include entries/parabolaiso-x86_64-linux-libre.conf -include entries/parabolaiso-x86_64-speech-linux-libre.conf -default_selection entries/parabolaiso-x86_64-linux-libre.conf +include entries/01-parabolaiso-x86_64-linux-libre.conf +include entries/02-parabolaiso-x86_64-speech-linux-libre.conf +include entries/03-parabolaiso-x86_64-ram-linux-libre.conf +default_selection 1 diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index 3b6ecfd..1c3a739 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -79,6 +79,7 @@ partimage pcsclite ppp pptpclient +pv qemu-guest-agent reflector reiserfsprogs diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index b2c943c..8d938b7 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -23,3 +23,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola32ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index b173f93..234e363 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -21,3 +21,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola64ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf index b49dd6e..b49dd6e 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-linux-libre.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf index 62167e7..62167e7 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/entries/parabolaiso-x86_64-speech-linux-libre.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf diff --git a/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf new file mode 100644 index 0000000..907169d --- /dev/null +++ b/configs/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf @@ -0,0 +1,8 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)" { + loader /%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/releng-openrc/efiboot/EFI/BOOT/refind.conf b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf index 075bf3f..9a59f11 100644 --- a/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf +++ b/configs/releng-openrc/efiboot/EFI/BOOT/refind.conf @@ -5,6 +5,7 @@ scanfor manual showtools shell firmware reboot shutdown timeout 15 -include entries/parabolaiso-x86_64-linux-libre.conf -include entries/parabolaiso-x86_64-speech-linux-libre.conf -default_selection entries/parabolaiso-x86_64-linux-libre.conf +include entries/01-parabolaiso-x86_64-linux-libre.conf +include entries/02-parabolaiso-x86_64-speech-linux-libre.conf +include entries/03-parabolaiso-x86_64-ram-linux-libre.conf +default_selection 1 diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index 392e1ef..5863a53 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -78,6 +78,7 @@ partimage pcsclite ppp pptpclient +pv qemu-guest-agent reflector reiserfsprogs diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg index b2c943c..8d938b7 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -23,3 +23,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola32ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg index b173f93..234e363 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -21,3 +21,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola64ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 4fce10c..dd0193d 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -2,7 +2,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Match] -Type=ether +Type=en* +Type=eth* [Network] DHCP=yes diff --git a/configs/releng/airootfs/etc/systemd/network/20-wlan.network b/configs/releng/airootfs/etc/systemd/network/20-wlan.network new file mode 100644 index 0000000..c164666 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/network/20-wlan.network @@ -0,0 +1,15 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Match] +Name=wl* + +[Network] +DHCP=yes +IPv6PrivacyExtensions=yes + +[DHCPv4] +RouteMetric=1024 + +[DHCPv6] +RouteMetric=1024 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wwan.network b/configs/releng/airootfs/etc/systemd/network/20-wwan.network index cc946fe..ff5ad66 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wwan.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wwan.network @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later [Match] -Type=wwan +Type=ww* [Network] DHCP=yes diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf index 5f15e97..5f15e97 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-linux-libre.conf +++ b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf index ac42de8..ac42de8 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-speech-linux-libre.conf +++ b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf diff --git a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf new file mode 100644 index 0000000..ad4eca4 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf @@ -0,0 +1,7 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +title Parabola GNU/Linux-libre install medium (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/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 3f878d9..f16e80b 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-3.0-or-later timeout 15 -default parabolaiso-x86_64-linux-libre.conf +default 01-parabolaiso-x86_64-linux-libre.conf diff --git a/configs/releng/packages.both b/configs/releng/packages.both index 48c48e6..a06ccd5 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -75,6 +75,7 @@ partimage pcsclite ppp pptpclient +pv qemu-guest-agent reflector reiserfsprogs diff --git a/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg index b2c943c..8d938b7 100644 --- a/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg +++ b/configs/releng/syslinux/parabolaiso_sys32-linux-libre.cfg @@ -23,3 +23,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola32ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (i686, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg index b173f93..234e363 100644 --- a/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg +++ b/configs/releng/syslinux/parabolaiso_sys64-linux-libre.cfg @@ -21,3 +21,14 @@ MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on + +# Copy to RAM boot option +LABEL parabola64ram +TEXT HELP +Boot the Parabola GNU/Linux-libre install medium on BIOS with Copy-to-RAM option +It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +ENDTEXT +MENU LABEL Parabola GNU/Linux-libre install medium (x86_64, BIOS, Copy to RAM) +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram diff --git a/docs/README.bootparams b/docs/README.bootparams index b9eadb4..34fdf43 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -24,7 +24,9 @@ INDEX * parabolaisobasedir= Set the base directory where all files reside. Default: "parabola" * copytoram= If set to "y" or just "copytoram" without arguments, - all SquashFS are copied to "RAM". + all SquashFS are copied to "RAM". If you add the package + "pv" to the packages.both it is used to display the copy + progress. Default: (unset) * checksum= If set to "y" or just "checksum" without arguments, performs a self-test of all files inside ${install_dir}, diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso index 8f532c3..daac88b 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso +++ b/parabolaiso/initcpio/hooks/parabolaiso @@ -69,10 +69,23 @@ _mnt_sfs() { # defined via initcpio's parse_cmdline() if [ "${copytoram}" = "y" ]; then msg -n ":: Copying squashfs image to RAM..." - if ! cp -- "${img}" "/run/parabolaiso/copytoram/${img_fullname}" ; then + + # in case we have pv use it to display copy progress feedback otherwise + # fallback to using plain cp + if command -v pv > /dev/null 2>&1; then + echo "" + (pv "${img}" > "/run/parabolaiso/copytoram/${img_fullname}") + local rc=$? + else + (cp -- "${img}" "/run/parabolaiso/copytoram/${img_fullname}") + local rc=$? + fi + + if [ $rc != 0 ]; then echo "ERROR: while copy '${img}' to '/run/parabolaiso/copytoram/${img_fullname}'" launch_interactive_shell fi + img="/run/parabolaiso/copytoram/${img_fullname}" msg "done." fi diff --git a/parabolaiso/initcpio/install/parabolaiso b/parabolaiso/initcpio/install/parabolaiso index 1e3b3b6..21af5b8 100644 --- a/parabolaiso/initcpio/install/parabolaiso +++ b/parabolaiso/initcpio/install/parabolaiso @@ -19,6 +19,12 @@ build() { add_binary gpg add_binary grep + if command -v pv > /dev/null 2>&1; then + add_binary pv + else + warning 'pv not found; falling back to cp for copy to RAM' + fi + add_file /usr/lib/udev/rules.d/60-cdrom_id.rules add_file /usr/lib/udev/rules.d/10-dm.rules add_file /usr/lib/udev/rules.d/95-dm-notify.rules diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index db49ba7..0fa0f04 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -261,9 +261,9 @@ _mksignature() { # Helper function to run functions only one time. _run_once() { - if [[ ! -e "${work_dir}/${run_once_mode}.${1}" ]]; then + if [[ ! -e "${work_dir}/${run_once_mode}.${1}.${arch}" ]]; then "$1" - touch "${work_dir}/${run_once_mode}.${1}_${arch}" + touch "${work_dir}/${run_once_mode}.${1}.${arch}" fi } |