diff options
author | David P <megver83@parabola.nu> | 2020-08-11 11:50:05 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-08-11 11:52:38 -0400 |
commit | d51ab687e642ab1c44f0843d4fe4b024819762ed (patch) | |
tree | 0ecbbe2e16dd59d3942479dfb8cf5d5abc072f4e | |
parent | 231f35c3c4ae7a1cf073e67f6ae091d1f1053a7c (diff) |
sync with archiso
Imported changes:
951b217 (HEAD -> master, origin/master, origin/HEAD) configs/releng/packages.x86_64: replace exfat-utils with exfatprogs
e467c69 configs/releng/syslinux/archiso_pxe.cfg: add "checksum" and "verify" boot options
8e82bbb archiso/initcpio/hooks/archiso: remove option terminator from the blockdev command
6312ccc Ensure all files in the ISO's Rock Ridge file system are owned by root
-rw-r--r-- | configs/lxde-openrc/packages.both | 2 | ||||
-rw-r--r-- | configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg | 6 | ||||
-rw-r--r-- | configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg | 6 | ||||
-rw-r--r-- | configs/releng-openrc/packages.both | 2 | ||||
-rw-r--r-- | configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg | 6 | ||||
-rw-r--r-- | configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg | 6 | ||||
-rw-r--r-- | configs/releng/packages.both | 2 | ||||
-rw-r--r-- | configs/releng/syslinux/parabolaiso_pxe32.cfg | 6 | ||||
-rw-r--r-- | configs/releng/syslinux/parabolaiso_pxe64.cfg | 6 | ||||
-rw-r--r-- | configs/talkingparabola/packages.both | 2 | ||||
-rw-r--r-- | configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg | 6 | ||||
-rw-r--r-- | configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg | 6 | ||||
-rw-r--r-- | parabolaiso/initcpio/hooks/parabolaiso | 2 | ||||
-rwxr-xr-x | parabolaiso/mkparabolaiso | 2 |
14 files changed, 31 insertions, 29 deletions
diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index 7ba7e18..6e44bea 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -15,7 +15,7 @@ dosfstools efibootmgr elogind ethtool -exfat-utils +exfatprogs f2fs-tools fsarchiver gnu-netcat diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg index 4e88b06..9f7e650 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe32.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola32_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola32_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg b/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg index 4f6ca04..1d3d67e 100644 --- a/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg +++ b/configs/lxde-openrc/syslinux/parabolaiso_pxe64.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola64_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola64_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index 8803036..ef0c967 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -14,7 +14,7 @@ dosfstools efibootmgr elogind ethtool -exfat-utils +exfatprogs f2fs-tools fsarchiver gnu-netcat diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg index 4e88b06..9f7e650 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe32.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola32_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola32_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg b/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg index 4f6ca04..1d3d67e 100644 --- a/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng-openrc/syslinux/parabolaiso_pxe64.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola64_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola64_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/releng/packages.both b/configs/releng/packages.both index bdfac66..c3c410d 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -13,7 +13,7 @@ dnsmasq dosfstools efibootmgr ethtool -exfat-utils +exfatprogs f2fs-tools fsarchiver gnu-netcat diff --git a/configs/releng/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32.cfg index 4e88b06..9f7e650 100644 --- a/configs/releng/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe32.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola32_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola32_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/releng/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64.cfg index 4f6ca04..1d3d67e 100644 --- a/configs/releng/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe64.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola64_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola64_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/talkingparabola/packages.both b/configs/talkingparabola/packages.both index f340139..c96db1a 100644 --- a/configs/talkingparabola/packages.both +++ b/configs/talkingparabola/packages.both @@ -16,7 +16,7 @@ dosfstools efibootmgr espeakup ethtool -exfat-utils +exfatprogs f2fs-tools fsarchiver gnu-netcat diff --git a/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg b/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg index 4e88b06..9f7e650 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_pxe32.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola32_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola32_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg b/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg index 4f6ca04..1d3d67e 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_pxe64.cfg @@ -9,7 +9,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL parabola64_nfs @@ -20,7 +20,7 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify SYSAPPEND 3 LABEL parabola64_http @@ -31,5 +31,5 @@ ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso index 975894f..255b987 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso +++ b/parabolaiso/initcpio/hooks/parabolaiso @@ -14,7 +14,7 @@ _mnt_dmsnapshot() { ro_dev="$(losetup --find --show --read-only -- "${img}")" echo "${ro_dev}" >> /run/parabolaiso/used_block_devices - ro_dev_size="$(blockdev --getsz -- "${ro_dev}")" + ro_dev_size="$(blockdev --getsz "${ro_dev}")" if [ "${cow_persistent}" = "P" ]; then if [ -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" ]; then diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index f5b7e20..f7fae78 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -309,6 +309,7 @@ command_iso () { xorriso -as mkisofs -quiet \ -iso-level 3 \ -full-iso9660-filenames \ + -rational-rock \ -volid "${iso_label}" \ -appid "${iso_application}" \ -publisher "${iso_publisher}" \ @@ -324,6 +325,7 @@ command_iso () { xorriso -as mkisofs \ -iso-level 3 \ -full-iso9660-filenames \ + -rational-rock \ -volid "${iso_label}" \ -appid "${iso_application}" \ -publisher "${iso_publisher}" \ |