From d51ab687e642ab1c44f0843d4fe4b024819762ed Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 11 Aug 2020 11:50:05 -0400 Subject: 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 --- parabolaiso/initcpio/hooks/parabolaiso | 2 +- parabolaiso/mkparabolaiso | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'parabolaiso') 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}" \ -- cgit v1.2.2