| index : mkinitcpio-archiso32 | |
| Archlinux32 initcpio scripts used by archiso | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | hooks/archiso | 29 | ||||
| -rw-r--r-- | hooks/archiso_loop_mnt | 6 | ||||
| -rw-r--r-- | hooks/archiso_pxe_common | 20 | ||||
| -rw-r--r-- | hooks/archiso_pxe_http | 2 | ||||
| -rw-r--r-- | hooks/archiso_pxe_nbd | 4 |
diff --git a/hooks/archiso b/hooks/archiso index d897ae1..742fbbf 100644 --- a/hooks/archiso +++ b/hooks/archiso @@ -7,13 +7,13 @@ _mnt_dmsnapshot() { local img="${1}" local newroot="${2}" local mnt="${3}" - local img_fullname="${img##*/}"; + local img_fullname="${img##*/}" local img_name="${img_fullname%%.*}" local dm_snap_name="${dm_snap_prefix}_${img_name}" local ro_dev ro_dev_size rw_dev ro_dev="$(losetup --find --show --read-only -- "${img}")" - echo "${ro_dev}" >> /run/archiso/used_block_devices + printf '%s\n' "${ro_dev}" >>/run/archiso/used_block_devices ro_dev_size="$(blockdev --getsz "${ro_dev}")" if [ "${cow_persistent}" = "P" ]; then @@ -33,7 +33,7 @@ _mnt_dmsnapshot() { fi rw_dev="$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow")" - echo "${rw_dev}" >> /run/archiso/used_block_devices + printf '%s\n' "${rw_dev}" >>/run/archiso/used_block_devices dmsetup create "${dm_snap_name}" --table \ "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}" @@ -43,7 +43,7 @@ _mnt_dmsnapshot() { fi _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults" - readlink -f "/dev/mapper/${dm_snap_name}" >> /run/archiso/used_block_devices + readlink -f "/dev/mapper/${dm_snap_name}" >>/run/archiso/used_block_devices } # args: source, newroot, mountpoint @@ -53,11 +53,10 @@ _mnt_overlayfs() { local mnt="${3}" mkdir -p "/run/archiso/cowspace/${cow_directory}/upperdir" "/run/archiso/cowspace/${cow_directory}/workdir" mount -t overlay -o \ - "lowerdir=${src},upperdir=/run/archiso/cowspace/${cow_directory}/upperdir,workdir=/run/archiso/cowspace/${cow_directory}/workdir" \ - airootfs "${newroot}${mnt}" + "lowerdir=${src},upperdir=/run/archiso/cowspace/${cow_directory}/upperdir,workdir=/run/archiso/cowspace/${cow_directory}/workdir" \ + airootfs "${newroot}${mnt}" } - # args: /path/to/image_file, mountpoint _mnt_sfs() { local img="${1}" @@ -72,9 +71,9 @@ _mnt_sfs() { # 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 + if command -v pv >/dev/null 2>&1; then echo "" - (pv "${img}" > "/run/archiso/copytoram/${img_fullname}") + (pv "${img}" >"/run/archiso/copytoram/${img_fullname}") local rc=$? else (cp -- "${img}" "/run/archiso/copytoram/${img_fullname}") @@ -90,7 +89,7 @@ _mnt_sfs() { msg "done." fi sfs_dev="$(losetup --find --show --read-only -- "${img}")" - echo "${sfs_dev}" >> /run/archiso/used_block_devices + echo "${sfs_dev}" >>/run/archiso/used_block_devices _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults" } @@ -105,7 +104,7 @@ _mnt_erofs() { # defined via initcpio's parse_cmdline() if [ "${copytoram}" = "y" ]; then msg -n ":: Copying EROFS image to RAM..." - if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}" ; then + if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}"; then echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'" launch_interactive_shell fi @@ -113,7 +112,7 @@ _mnt_erofs() { msg "done." fi erofs_dev="$(losetup --find --show --read-only -- "${img}")" - echo "${erofs_dev}" >> /run/archiso/used_block_devices + echo "${erofs_dev}" >>/run/archiso/used_block_devices _mnt_dev "${erofs_dev}" "${mnt}" "-r" "defaults" "erofs" } @@ -149,7 +148,7 @@ _mnt_dev() { _verify_checksum() { local _status cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" || exit 1 - sha512sum -c airootfs.sha512 > /tmp/checksum.log 2>&1 + sha512sum -c airootfs.sha512 >/tmp/checksum.log 2>&1 _status=$? cd -- "${OLDPWD}" || exit 1 return "${_status}" @@ -203,7 +202,7 @@ archiso_mount_handler() { if ! mountpoint -q "/run/archiso/bootmnt"; then _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" "defaults" if [ "${copytoram}" != "y" ]; then - readlink -f "${archisodevice}" >> /run/archiso/used_block_devices + readlink -f "${archisodevice}" >>/run/archiso/used_block_devices fi fi @@ -255,7 +254,7 @@ archiso_mount_handler() { if [ -n "${cow_device}" ]; then _mnt_dev "${cow_device}" "/run/archiso/cowspace" "-r" "${cow_flags}" - readlink -f "${cow_device}" >> /run/archiso/used_block_devices + readlink -f "${cow_device}" >>/run/archiso/used_block_devices mount -o remount,rw "/run/archiso/cowspace" else msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..." diff --git a/hooks/archiso_loop_mnt b/hooks/archiso_loop_mnt index 41899e4..a5a71e8 100644 --- a/hooks/archiso_loop_mnt +++ b/hooks/archiso_loop_mnt @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -run_hook () { +run_hook() { # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() [ -n "${img_label}" ] && img_dev="/dev/disk/by-label/${img_label}" @@ -14,7 +14,7 @@ run_hook () { fi } -archiso_loop_mount_handler () { +archiso_loop_mount_handler() { newroot="${1}" local _dev_loop @@ -24,7 +24,7 @@ archiso_loop_mount_handler () { # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() if [ "${copytoram}" != "y" ]; then - readlink -f "${img_dev}" >> /run/archiso/used_block_devices + readlink -f "${img_dev}" >>/run/archiso/used_block_devices fi if _dev_loop=$(losetup --find --show --read-only "/run/archiso/img_dev/${img_loop}"); then diff --git a/hooks/archiso_pxe_common b/hooks/archiso_pxe_common index 00507cb..6cadc34 100644 --- a/hooks/archiso_pxe_common +++ b/hooks/archiso_pxe_common @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -run_hook () { +run_hook() { # Do *not* declare 'bootif_dev' local! We need it in run_latehook(). local i net_mac bootif_mac local DNSDOMAIN HOSTNAME IPV4DNS0 IPV4DNS1 ROOTSERVER @@ -17,7 +17,7 @@ run_hook () { # ash supports bash-like string replacment bootif_mac="${bootif_mac//-/:}" for i in /sys/class/net/*/address; do - read -r net_mac < "${i}" + read -r net_mac <"${i}" if [ "${bootif_mac}" = "${net_mac}" ]; then bootif_dev=${i#/sys/class/net/} bootif_dev=${bootif_dev%/address} @@ -47,20 +47,20 @@ run_hook () { # setup DNS resolver if [ "${IPV4DNS0}" != "0.0.0.0" ]; then - echo "# added by archiso_pxe_common hook" > /etc/resolv.conf - echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf + echo "# added by archiso_pxe_common hook" >/etc/resolv.conf + echo "nameserver ${IPV4DNS0}" >>/etc/resolv.conf fi if [ "${IPV4DNS1}" != "0.0.0.0" ]; then - echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf + echo "nameserver ${IPV4DNS1}" >>/etc/resolv.conf fi if [ -n "${DNSDOMAIN}" ]; then - echo "search ${DNSDOMAIN}" >> /etc/resolv.conf - echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf + echo "search ${DNSDOMAIN}" >>/etc/resolv.conf + echo "domain ${DNSDOMAIN}" >>/etc/resolv.conf fi fi } -run_latehook () { +run_latehook() { if [ -n "${ip}" ]; then [ -z "${copy_resolvconf}" ] && copy_resolvconf="y" @@ -73,8 +73,8 @@ run_latehook () { ip link set "${netdev}" down done elif [ "${copy_resolvconf}" != "n" ] && [ -f /etc/resolv.conf ]; then - rm -f /new_root/etc/resolv.conf - cp /etc/resolv.conf /new_root/etc/resolv.conf + rm -f -- /new_root/etc/resolv.conf + cp -- /etc/resolv.conf /new_root/etc/resolv.conf fi fi } diff --git a/hooks/archiso_pxe_http b/hooks/archiso_pxe_http index 43b8b4b..db75703 100644 --- a/hooks/archiso_pxe_http +++ b/hooks/archiso_pxe_http @@ -37,7 +37,7 @@ _curl_get() { fi } -archiso_pxe_http_mount_handler () { +archiso_pxe_http_mount_handler() { newroot="${1}" local img_type="sfs" diff --git a/hooks/archiso_pxe_nbd b/hooks/archiso_pxe_nbd index 8ac44e7..2e363d9 100644 --- a/hooks/archiso_pxe_nbd +++ b/hooks/archiso_pxe_nbd @@ -7,7 +7,7 @@ run_earlyhook() { # defined via initcpio's parse_cmdline() if [ -n "${ip}" ] && [ -n "${archiso_nbd_srv}" ]; then # Module autoloading like with loop devices does not work, doing manually... - modprobe nbd 2> /dev/null + modprobe nbd 2>/dev/null fi } @@ -21,7 +21,7 @@ run_hook() { fi } -archiso_pxe_nbd_mount_handler () { +archiso_pxe_nbd_mount_handler() { newroot="${1}" msg ":: Waiting for boot device..." |