diff options
75 files changed, 1006 insertions, 428 deletions
diff --git a/.editorconfig b/.editorconfig index 4fa38d5..4a540f3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,12 @@ trim_trailing_whitespace = true charset = utf-8 indent_style = space indent_size = 4 +max_line_length = 120 + +[*.{yml,yaml}] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = space +indent_size = 2 @@ -1,2 +1,4 @@ *~ -archiso-*.tar.gz* +archiso32-*.tar.gz* +configs/*/work +configs/*/out diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e69ab5e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +--- + +default: + image: archlinux/base + before_script: + - pacman --noconfirm -Syu --needed base-devel shellcheck + +lint: + stage: build + script: + - make check @@ -1,4 +1,4 @@ -V=43 +V=$(shell git describe --exact-match) INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) @@ -15,6 +15,15 @@ DOC_DIR=$(DESTDIR)/usr/share/doc/archiso all: +check: + shellcheck -s bash archiso/mkarchiso \ + scripts/run_archiso.sh \ + $(INSTALL_FILES) \ + $(wildcard configs/*/build.sh) \ + configs/releng/airootfs/root/.automated_script.sh \ + configs/releng/airootfs/usr/local/bin/choose-mirror + shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) + install: install-program install-initcpio install-examples install-doc install-program: @@ -35,7 +44,10 @@ install-doc: install -m 644 -t $(DOC_DIR) $(DOC_FILES) dist: - git archive --format=tar --prefix=archiso-$(V)/ v$(V) | gzip -9 > archiso-$(V).tar.gz - gpg --detach-sign --use-agent archiso-$(V).tar.gz + git archive --format=tar --prefix=archiso32-$(V)/ $(V) | gzip -9 > archiso32-$(V).tar.gz + gpg --detach-sign --use-agent archiso32-$(V).tar.gz + +upload: + scp archiso32-$(V).tar.gz archiso32-$(V).tar.gz.sig sources.archlinux32.org:sources/ -.PHONY: install install-program install-initcpio install-examples install-doc dist +.PHONY: check install install-program install-initcpio install-examples install-doc dist upload diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 5c56561..7f2f9a7 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -1,3 +1,5 @@ +#!/bin/ash + # args: source, newroot, mountpoint _mnt_dmsnapshot() { local img="${1}" @@ -8,19 +10,19 @@ _mnt_dmsnapshot() { 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 - ro_dev_size=$(blockdev --getsz ${ro_dev}) + ro_dev="$(losetup --find --show --read-only -- "${img}")" + echo "${ro_dev}" >> /run/archiso/used_block_devices + ro_dev_size="$(blockdev --getsz -- "${ro_dev}")" - if [[ "${cow_persistent}" == "P" ]]; then - if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then + if [ "${cow_persistent}" = "P" ]; then + if [ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]; then msg ":: Found '/run/archiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent." else msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as persistent." truncate -s "${cow_spacesize}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" fi else - if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then + if [ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]; then msg ":: Found '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' but non-persistent requested, removing." rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" fi @@ -28,17 +30,18 @@ _mnt_dmsnapshot() { truncate -s "${cow_spacesize}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" fi - rw_dev=$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow") - echo ${rw_dev} >> /run/archiso/used_block_devices + rw_dev="$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow")" + echo "${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}" + dmsetup create "${dm_snap_name}" --table \ + "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}" - if [[ "${cow_persistent}" != "P" ]]; then + if [ "${cow_persistent}" != "P" ]; then rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" fi _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults" - echo $(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 @@ -46,8 +49,10 @@ _mnt_overlayfs() { local src="${1}" local newroot="${2}" 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}" + 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}" } @@ -58,17 +63,19 @@ _mnt_sfs() { local img_fullname="${img##*/}" local sfs_dev - if [[ "${copytoram}" == "y" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${copytoram}" = "y" ]; then msg -n ":: Copying squashfs 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 img="/run/archiso/copytoram/${img_fullname}" msg "done." fi - sfs_dev=$(losetup --find --show --read-only "${img}") - echo ${sfs_dev} >> /run/archiso/used_block_devices + sfs_dev="$(losetup --find --show --read-only -- "${img}")" + echo "${sfs_dev}" >> /run/archiso/used_block_devices _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults" } @@ -102,45 +109,48 @@ _mnt_dev() { _verify_checksum() { local _status - cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" + cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" || exit 1 sha512sum -c airootfs.sha512 > /tmp/checksum.log 2>&1 _status=$? - cd "${OLDPWD}" - return ${_status} + cd -- "${OLDPWD}" || exit 1 + return "${_status}" } _verify_signature() { local _status - cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" + cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" || exit 1 gpg --homedir /gpg --status-fd 1 --verify airootfs.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG' _status=$? - cd "${OLDPWD}" + cd -- "${OLDPWD}" || exit 1 return ${_status} } run_hook() { - [[ -z "${arch}" ]] && arch="$(uname -m)" - [[ -z "${copytoram_size}" ]] && copytoram_size="75%" - [[ -z "${archisobasedir}" ]] && archisobasedir="arch" - [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" - [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}" - [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M" - - if [[ -n "${cow_label}" ]]; then + [ -z "${arch}" ] && arch="$(uname -m)" + [ -z "${copytoram_size}" ] && copytoram_size="75%" + [ -z "${archisobasedir}" ] && archisobasedir="arch" + [ -z "${dm_snap_prefix}" ] && dm_snap_prefix="arch" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + [ -z "${archisodevice}" ] && archisodevice="/dev/disk/by-label/${archisolabel}" + [ -z "${cow_spacesize}" ] && cow_spacesize="256M" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ -n "${cow_label}" ]; then cow_device="/dev/disk/by-label/${cow_label}" - [[ -z "${cow_persistent}" ]] && cow_persistent="P" - elif [[ -n "${cow_device}" ]]; then - [[ -z "${cow_persistent}" ]] && cow_persistent="P" + [ -z "${cow_persistent}" ] && cow_persistent="P" + elif [ -n "${cow_device}" ]; then + [ -z "${cow_persistent}" ] && cow_persistent="P" else cow_persistent="N" fi - [[ -z "${cow_flags}" ]] && cow_flags="defaults" - [[ -z "${cow_directory}" ]] && cow_directory="persistent_${archisolabel}/${arch}" - [[ -z "${cow_chunksize}" ]] && cow_chunksize="8" + [ -z "${cow_flags}" ] && cow_flags="defaults" + [ -z "${cow_directory}" ] && cow_directory="persistent_${archisolabel}/${arch}" + [ -z "${cow_chunksize}" ] && cow_chunksize="8" # set mount handler for archiso - mount_handler="archiso_mount_handler" + export mount_handler="archiso_mount_handler" } # This function is called normally from init script, but it can be called @@ -151,13 +161,15 @@ archiso_mount_handler() { if ! mountpoint -q "/run/archiso/bootmnt"; then _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" "defaults" - if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${archisodevice}) >> /run/archiso/used_block_devices + if [ "${copytoram}" != "y" ]; then + readlink -f "${archisodevice}" >> /run/archiso/used_block_devices fi fi - if [[ "${checksum}" == "y" ]]; then - if [[ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sha512" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${checksum}" = "y" ]; then + if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sha512" ]; then msg -n ":: Self-test requested, please wait..." if _verify_checksum; then msg "done. Checksum is OK, continue booting." @@ -172,8 +184,10 @@ archiso_mount_handler() { fi fi - if [[ "${verify}" == "y" ]]; then - if [[ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs.sig" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${verify}" = "y" ]; then + if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs.sig" ]; then msg -n ":: Signature verification requested, please wait..." if _verify_signature; then msg "done. Signature is OK, continue booting." @@ -187,33 +201,34 @@ archiso_mount_handler() { fi fi - if [[ "${copytoram}" == "y" ]]; then + if [ "${copytoram}" = "y" ]; then msg ":: Mounting /run/archiso/copytoram (tmpfs) filesystem, size=${copytoram_size}" mkdir -p /run/archiso/copytoram mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/archiso/copytoram fi - if [[ -n "${cow_device}" ]]; then + if [ -n "${cow_device}" ]; then _mnt_dev "${cow_device}" "/run/archiso/cowspace" "-r" "${cow_flags}" - echo $(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}..." mkdir -p /run/archiso/cowspace mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/archiso/cowspace fi - mkdir -p -m 0700 "/run/archiso/cowspace/${cow_directory}" + mkdir -p "/run/archiso/cowspace/${cow_directory}" + chmod 0700 "/run/archiso/cowspace/${cow_directory}" _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs" - if [[ -f "/run/archiso/sfs/airootfs/airootfs.img" ]]; then + if [ -f "/run/archiso/sfs/airootfs/airootfs.img" ]; then _mnt_dmsnapshot "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/" else _mnt_overlayfs "/run/archiso/sfs/airootfs" "${newroot}" "/" fi - if [[ "${copytoram}" == "y" ]]; then + if [ "${copytoram}" = "y" ]; then umount -d /run/archiso/bootmnt fi } -# vim:ft=sh:ts=4:sw=4:et: +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt index 2e99404..2c607f5 100644 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ b/archiso/initcpio/hooks/archiso_loop_mnt @@ -1,10 +1,14 @@ -# vim: set ft=sh: +#!/bin/ash run_hook () { - [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}" - [[ -z "${img_flags}" ]] && img_flags="defaults" - if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then - mount_handler="archiso_loop_mount_handler" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + [ -n "${img_label}" ] && img_dev="/dev/disk/by-label/${img_label}" + [ -z "${img_flags}" ] && img_flags="defaults" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ -n "${img_dev}" ] && [ -n "${img_loop}" ]; then + export mount_handler="archiso_loop_mount_handler" fi } @@ -15,21 +19,25 @@ archiso_loop_mount_handler () { msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" "${img_flags}" - if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${img_dev}) >> /run/archiso/used_block_devices + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${copytoram}" != "y" ]; then + 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 - archisodevice="${_dev_loop}" + export archisodevice="${_dev_loop}" else echo "ERROR: Setting loopback device for file '/run/archiso/img_dev/${img_loop}'" launch_interactive_shell fi - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" - if [[ "${copytoram}" == "y" ]]; then - losetup -d ${_dev_loop} 2>/dev/null + if [ "${copytoram}" = "y" ]; then + losetup -d "${_dev_loop}" 2>/dev/null umount /run/archiso/img_dev fi } + +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index 2380ca3..bf8e883 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -1,55 +1,57 @@ -# vim: set ft=sh: +#!/bin/ash 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 # These variables will be parsed from /tmp/net-*.conf generated by ipconfig - local DEVICE - local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 - local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH - local filename - # /tmp/net-*.conf + # shellcheck disable=SC2034 + local DEVICE IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY NISDOMAIN ROOTPATH filename - if [[ -n "${ip}" ]]; then - if [[ -n "${BOOTIF}" ]]; then - bootif_mac=${BOOTIF#01-} - bootif_mac=${bootif_mac//-/:} + if [ -n "${ip}" ]; then + if [ -n "${BOOTIF}" ]; then + bootif_mac="${BOOTIF#01-}" + # shellcheck disable=SC2169 + # ash supports bash-like string replacment + bootif_mac="${bootif_mac//-/:}" for i in /sys/class/net/*/address; do - read net_mac < ${i} - if [[ "${bootif_mac}" == "${net_mac}" ]]; then + read -r net_mac < "${i}" + if [ "${bootif_mac}" = "${net_mac}" ]; then bootif_dev=${i#/sys/class/net/} bootif_dev=${bootif_dev%/address} break fi done - if [[ "${ip}" == "dhcp" ]]; then + if [ "${ip}" = "dhcp" ]; then ip=":::::${bootif_dev}:dhcp" - else + else ip="${ip}::${bootif_dev}" fi fi # setup network and save some values if ! ipconfig -t 20 "ip=${ip}"; then - echo "ERROR; Failed to configure network" - echo " Falling back to interactive prompt" - echo " You can try to fix the problem manually, log out when you are finished" - launch_interactive_shell + echo "ERROR; Failed to configure network" + echo " Falling back to interactive prompt" + echo " You can try to fix the problem manually, log out when you are finished" + launch_interactive_shell fi + # shellcheck disable=SC1090 + # ipconfig generates these files . /tmp/net-*.conf - pxeserver=${ROOTSERVER} + export pxeserver="${ROOTSERVER}" # setup DNS resolver - if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then + if [ "${IPV4DNS0}" != "0.0.0.0" ]; then echo "# added by archiso_pxe_common hook" > /etc/resolv.conf echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf fi - if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then + if [ "${IPV4DNS1}" != "0.0.0.0" ]; then echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf fi - if [[ -n "${DNSDOMAIN}" ]]; then + if [ -n "${DNSDOMAIN}" ]; then echo "search ${DNSDOMAIN}" >> /etc/resolv.conf echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf fi @@ -57,16 +59,20 @@ run_hook () { } run_latehook () { - if [[ -n "${ip}" ]]; then - [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y" + if [ -n "${ip}" ]; then + [ -z "${copy_resolvconf}" ] && copy_resolvconf="y" - if [[ "${copytoram}" == "y" ]]; then - if [[ -n "${bootif_dev}" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${copytoram}" = "y" ]; then + if [ -n "${bootif_dev}" ]; then ip addr flush dev "${bootif_dev}" ip link set "${bootif_dev}" down fi - elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then + elif [ "${copy_resolvconf}" != "n" ] && [ -f /etc/resolv.conf ]; then cp /etc/resolv.conf /new_root/etc/resolv.conf fi fi } + +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http index a7c03a8..bf2f5f4 100644 --- a/archiso/initcpio/hooks/archiso_pxe_http +++ b/archiso/initcpio/hooks/archiso_pxe_http @@ -1,16 +1,18 @@ -# vim: set ft=sh: +#!/bin/ash run_hook() { - if [[ -n "${ip}" && -n "${archiso_http_srv}" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ -n "${ip}" ] && [ -n "${archiso_http_srv}" ]; then # booting with http is always copy-to-ram, so set here to make sure # addresses are flushed and interface is set down - copytoram="y" + export copytoram="y" - archiso_http_srv=$(eval echo ${archiso_http_srv}) - [[ -z "${archiso_http_spc}" ]] && archiso_http_spc="75%" + archiso_http_srv=$(eval echo "${archiso_http_srv}") + [ -z "${archiso_http_spc}" ] && archiso_http_spc="75%" - mount_handler="archiso_pxe_http_mount_handler" + export mount_handler="archiso_pxe_http_mount_handler" fi } @@ -23,6 +25,8 @@ _curl_get() { local _dst="${2}" msg ":: Downloading '${_url}'" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then echo "ERROR: Downloading '${_url}'" echo " Falling back to interactive prompt" @@ -38,17 +42,25 @@ archiso_pxe_http_mount_handler () { mkdir -p "/run/archiso/httpspace" mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace" + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}" - if [[ "${checksum}" == "y" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${checksum}" = "y" ]; then _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sha512" "/${arch}" fi - if [[ "${verify}" == "y" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ "${verify}" = "y" ]; then _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs.sig" "/${arch}" fi mkdir -p "/run/archiso/bootmnt" mount -o bind /run/archiso/httpspace /run/archiso/bootmnt - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" } + +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_pxe_nbd b/archiso/initcpio/hooks/archiso_pxe_nbd index 4fb7fa5..4ccbcbf 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nbd +++ b/archiso/initcpio/hooks/archiso_pxe_nbd @@ -1,19 +1,21 @@ -# vim: set ft=sh: +#!/bin/ash run_earlyhook() { - if [[ -n "${ip}" && -n "${archiso_nbd_srv}" ]]; then + # shellcheck disable=SC2154 + # 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 fi } run_hook() { - if [[ -n "${ip}" && -n "${archiso_nbd_srv}" ]]; then + if [ -n "${ip}" ] && [ -n "${archiso_nbd_srv}" ]; then - archiso_nbd_srv=$(eval echo ${archiso_nbd_srv}) - [[ -z "${archiso_nbd_name}" ]] && archiso_nbd_name="archiso" + archiso_nbd_srv=$(eval echo "${archiso_nbd_srv}") + [ -z "${archiso_nbd_name}" ] && archiso_nbd_name="archiso" - mount_handler="archiso_pxe_nbd_mount_handler" + export mount_handler="archiso_pxe_nbd_mount_handler" fi } @@ -29,19 +31,21 @@ archiso_pxe_nbd_mount_handler () { done msg ":: Setup NBD from ${archiso_nbd_srv} at /dev/nbd0" - if [[ "${copytoram}" != "n" ]]; then - nbd-client ${archiso_nbd_srv} -N ${archiso_nbd_name} /dev/nbd0 + if [ "${copytoram}" != "n" ]; then + nbd-client "${archiso_nbd_srv}" -N "${archiso_nbd_name}" /dev/nbd0 copytoram="y" else - nbd-client ${archiso_nbd_srv} -N ${archiso_nbd_name} -systemd-mark -persist /dev/nbd0 + nbd-client "${archiso_nbd_srv}" -N "${archiso_nbd_name}" -systemd-mark -persist /dev/nbd0 fi - archisodevice=/dev/nbd0 + export archisodevice=/dev/nbd0 - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" - if [[ "${copytoram}" == "y" ]]; then + if [ "${copytoram}" = "y" ]; then msg ":: Disconnect NBD from ${archiso_nbd_srv} at /dev/nbd0" nbd-client -d /dev/nbd0 fi } + +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_pxe_nfs b/archiso/initcpio/hooks/archiso_pxe_nfs index 67874ec..be1e4c3 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nfs +++ b/archiso/initcpio/hooks/archiso_pxe_nfs @@ -1,30 +1,42 @@ -# vim: set ft=sh: +#!/bin/ash run_hook() { - if [[ -n "${ip}" && -n "${archiso_nfs_srv}" ]]; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ -n "${ip}" ] && [ -n "${archiso_nfs_srv}" ]; then - archiso_nfs_srv=$(eval echo ${archiso_nfs_srv}) - [[ -n "${archiso_nfs_opt}" ]] && archiso_nfs_opt="-o ${archiso_nfs_opt}" + archiso_nfs_srv=$(eval echo "${archiso_nfs_srv}") - mount_handler="archiso_nfs_mount_handler" + export mount_handler="archiso_nfs_mount_handler" fi } archiso_nfs_mount_handler() { + local mount_status newroot="${1}" mkdir -p "/run/archiso/bootmnt" msg ":: Mounting '${archiso_nfs_srv}'" - # Do not put "${archiso_nfs_opt}" nfsmount fails! - if ! nfsmount ${archiso_nfs_opt} "${archiso_nfs_srv}" "/run/archiso/bootmnt"; then + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() + if [ -n "${archiso_nfs_opt}" ]; then + nfsmount -o "${archiso_nfs_opt}" "${archiso_nfs_srv}" "/run/archiso/bootmnt" + mount_status=$? + else + nfsmount "${archiso_nfs_srv}" "/run/archiso/bootmnt" + mount_status=$? + fi + if [ $mount_status -gt 0 ]; then echo "ERROR: Mounting '${archiso_nfs_srv}'" echo " Falling back to interactive prompt" echo " You can try to fix the problem manually, log out when you are finished" launch_interactive_shell fi - if [[ "${copytoram}" != "n" ]]; then + if [ "${copytoram}" != "n" ]; then copytoram="y" fi - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" } + +# vim: set ft=sh: diff --git a/archiso/initcpio/hooks/archiso_shutdown b/archiso/initcpio/hooks/archiso_shutdown index e50dedb..db8fb33 100644 --- a/archiso/initcpio/hooks/archiso_shutdown +++ b/archiso/initcpio/hooks/archiso_shutdown @@ -1,6 +1,8 @@ +#!/bin/ash + run_cleanuphook() { rm -rf /usr/lib/modules cp -ax / /run/initramfs } -# vim: set ft=sh ts=4 sw=4 et: +# vim: set ft=sh: diff --git a/archiso/initcpio/install/archiso b/archiso/initcpio/install/archiso index 30728ef..a12104e 100644 --- a/archiso/initcpio/install/archiso +++ b/archiso/initcpio/install/archiso @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_module "cdrom" @@ -22,9 +22,7 @@ build() { add_file /usr/lib/udev/rules.d/95-dm-notify.rules add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules if [[ $ARCHISO_GNUPG_FD ]]; then - mkdir -p "$BUILDROOT$dest"/gpg - gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARCHISO_GNUPG_FD + mkdir -p "$BUILDROOT/gpg" + gpg --homedir "$BUILDROOT/gpg" --import <& "$ARCHISO_GNUPG_FD" fi } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_kms b/archiso/initcpio/install/archiso_kms index 3ff31f3..48832ff 100644 --- a/archiso/initcpio/install/archiso_kms +++ b/archiso/initcpio/install/archiso_kms @@ -1,9 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash build() { + add_module "amdgpu" add_module "radeon" add_module "nouveau" add_module "i915" + add_module "mgag200" add_module "via-agp" add_module "sis-agp" add_module "intel-agp" diff --git a/archiso/initcpio/install/archiso_loop_mnt b/archiso/initcpio/install/archiso_loop_mnt index 59f1d94..4a5824d 100644 --- a/archiso/initcpio/install/archiso_loop_mnt +++ b/archiso/initcpio/install/archiso_loop_mnt @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_runscript @@ -9,5 +9,3 @@ cat<<HELPEOF This hook loads the necessary modules for boot via loop device. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_pxe_common b/archiso/initcpio/install/archiso_pxe_common index eec9a7e..da5f6b6 100644 --- a/archiso/initcpio/install/archiso_pxe_common +++ b/archiso/initcpio/install/archiso_pxe_common @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/" @@ -8,13 +8,13 @@ build() { add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig # Add hosts support files+dns - add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2) - add_binary $(readlink -f /usr/lib/libnss_files.so.2) - add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2) - add_binary $(readlink -f /usr/lib/libnss_dns.so.2) + add_symlink /usr/lib/libnss_files.so.2 "$(readlink /usr/lib/libnss_files.so.2)" + add_binary "$(readlink -f /usr/lib/libnss_files.so.2)" + add_symlink /usr/lib/libnss_dns.so.2 "$(readlink /usr/lib/libnss_dns.so.2)" + add_binary "$(readlink -f /usr/lib/libnss_dns.so.2)" add_dir /etc - echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf + echo "hosts: files dns" > "$BUILDROOT/etc/nsswitch.conf" } help() { @@ -22,5 +22,3 @@ cat<<HELPEOF This hook loads the necessary modules for boot via PXE. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_pxe_http b/archiso/initcpio/install/archiso_pxe_http index 9ce9726..3353eb7 100644 --- a/archiso/initcpio/install/archiso_pxe_http +++ b/archiso/initcpio/install/archiso_pxe_http @@ -1,11 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_runscript add_binary curl - add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt + add_file "$(readlink -f /etc/ssl/certs/ca-certificates.crt)" /etc/ssl/certs/ca-certificates.crt } help() { @@ -13,5 +13,3 @@ cat<<HELPEOF This hook loads the necessary modules for boot via PXE and HTTP. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_pxe_nbd b/archiso/initcpio/install/archiso_pxe_nbd index 47d98ce..9fe3fdd 100644 --- a/archiso/initcpio/install/archiso_pxe_nbd +++ b/archiso/initcpio/install/archiso_pxe_nbd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_module "nbd" @@ -13,5 +13,3 @@ cat<<HELPEOF This hook loads the necessary modules for boot via PXE and NBD. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_pxe_nfs b/archiso/initcpio/install/archiso_pxe_nfs index f8226e5..fa4e548 100644 --- a/archiso/initcpio/install/archiso_pxe_nfs +++ b/archiso/initcpio/install/archiso_pxe_nfs @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_module "nfs" @@ -13,5 +13,3 @@ help() { This hook loads the necessary modules for boot via PXE and NFS. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_shutdown b/archiso/initcpio/install/archiso_shutdown index 5ae976a..1051d1b 100644 --- a/archiso/initcpio/install/archiso_shutdown +++ b/archiso/initcpio/install/archiso_shutdown @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build() { add_binary cp @@ -12,9 +12,7 @@ help() { cat <<HELPEOF This hook will create a shutdown initramfs in /run/initramfs that we can pivot to on shutdown in order to unmount / and -and others mount points, dm-snapshot devices and loopback devices. -Mostly usefull for dm-snapshot persistent. +and other mount points, dm-snapshot and loopback devices. +Mostly useful for persistent dm-snapshot. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/script/archiso_shutdown b/archiso/initcpio/script/archiso_shutdown index 41b3945..4a0c7dc 100644 --- a/archiso/initcpio/script/archiso_shutdown +++ b/archiso/initcpio/script/archiso_shutdown @@ -5,15 +5,15 @@ mkdir /oldrun mount -n --move /oldroot/run /oldrun # Unmount all mounts now. -umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r) +umount "$(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)" # Remove all dm-snapshot devices. dmsetup remove_all # Remove all loopback devices. for _lup in $(grep ^/dev/loop /oldrun/archiso/used_block_devices | tac); do - if ! losetup -d ${_lup} 2> /dev/null; then - umount -d ${_lup} + if ! losetup -d -- "${_lup}" 2> /dev/null; then + umount -d -- "${_lup}" fi done @@ -21,8 +21,8 @@ done umount /oldrun/archiso/cowspace # Unmount boot device if needed (no copytoram=y used) -if [[ ! -d /oldrun/archiso/copytoram ]]; then - if [[ -d /oldrun/archiso/img_dev ]]; then +if [ ! -d /oldrun/archiso/copytoram ]; then + if [ -d /oldrun/archiso/img_dev ]; then umount /oldrun/archiso/img_dev else umount /oldrun/archiso/bootmnt @@ -35,3 +35,5 @@ case "$1" in reboot|poweroff|halt) "$1" -f ;; *) halt -f;; esac + +# vim: set ft=sh: diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 567a5af..7b65cf6 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -5,12 +5,12 @@ set -e -u export LANG=C app_name=${0##*/} -arch=$(uname -m) -pkg_list="" +arch=${arch:-$(uname -m)} +pkg_list=() run_cmd="" quiet="y" pacman_conf="/etc/pacman.conf" -export iso_label="ARCH_$(date +%Y%m)" +iso_label="ARCH_$(date +%Y%m)" iso_publisher="Arch Linux <http://www.archlinux.org>" iso_application="Arch Linux Live/Rescue CD" install_dir="arch" @@ -37,13 +37,13 @@ _msg_error() { echo "[mkarchiso] ERROR: ${_msg}" echo if [[ ${_error} -gt 0 ]]; then - exit ${_error} + exit "${_error}" fi } _chroot_init() { mkdir -p ${work_dir}/airootfs - _pacman "base syslinux" + _pacman base syslinux } _chroot_run() { @@ -110,7 +110,7 @@ _usage () echo " make a pkglist.txt of packages installed on airootfs" echo " iso <image name>" echo " build an iso image from the working dir" - exit ${1} + exit "${1}" } # Shows configuration according to command mode. @@ -129,7 +129,7 @@ _show_config () { ;; install) _msg_info " Pacman config file: ${pacman_conf}" - _msg_info " Packages: ${pkg_list}" + _msg_info " Packages: ${pkg_list[*]}" ;; run) _msg_info " Run command: ${run_cmd}" @@ -154,9 +154,9 @@ _pacman () _msg_info "Installing packages to '${work_dir}/airootfs/'..." if [[ "${quiet}" = "y" ]]; then - pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $* &> /dev/null + pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@" &> /dev/null else - pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $* + pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@" fi _msg_info "Packages installed successfully!" @@ -208,7 +208,7 @@ _mkairootfs_img () { _msg_info "Creating ext4 image of 32GiB..." truncate -s 32G "${work_dir}/airootfs.img" local _qflag="" - if [[ ${quiet} == "y" ]]; then + if [[ "${quiet}" == "y" ]]; then _qflag="-q" fi mkfs.ext4 ${_qflag} -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F "${work_dir}/airootfs.img" @@ -223,12 +223,14 @@ _mkairootfs_img () { mkdir -p "${work_dir}/iso/${install_dir}/${arch}" _msg_info "Creating SquashFS image, this may take some time..." if [[ "${quiet}" = "y" ]]; then - mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress &> /dev/null + mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + -comp "${sfs_comp}" -no-progress &> /dev/null else - mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress + mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + -comp "${sfs_comp}" -no-progress fi _msg_info "Done!" - rm ${work_dir}/airootfs.img + rm "${work_dir}/airootfs.img" } # Makes a SquashFS filesystem from a source directory. @@ -240,9 +242,11 @@ _mkairootfs_sfs () { mkdir -p "${work_dir}/iso/${install_dir}/${arch}" _msg_info "Creating SquashFS image, this may take some time..." if [[ "${quiet}" = "y" ]]; then - mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress &> /dev/null + mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + -comp "${sfs_comp}" -no-progress &> /dev/null else - mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress + mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + -comp "${sfs_comp}" -no-progress fi _msg_info "Done!" } @@ -251,15 +255,15 @@ _mkchecksum () { _msg_info "Creating checksum file for self-test..." cd "${work_dir}/iso/${install_dir}/${arch}" sha512sum airootfs.sfs > airootfs.sha512 - cd ${OLDPWD} + cd "${OLDPWD}" _msg_info "Done!" } _mksignature () { _msg_info "Creating signature file..." cd "${work_dir}/iso/${install_dir}/${arch}" - gpg --detach-sign --default-key ${gpg_key} airootfs.sfs - cd ${OLDPWD} + gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs + cd "${OLDPWD}" _msg_info "Done!" } @@ -275,7 +279,7 @@ command_pkglist () { # Create an ISO9660 filesystem from "iso" directory. command_iso () { - local _iso_efi_boot_args="" + local _iso_efi_boot_args=() if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then _msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1 @@ -286,35 +290,51 @@ command_iso () { # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image. if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then - _iso_efi_boot_args="-eltorito-alt-boot - -e EFI/archiso/efiboot.img - -no-emul-boot - -isohybrid-gpt-basdat" + _iso_efi_boot_args+=( + '-eltorito-alt-boot' + '-e' 'EFI/archiso/efiboot.img' + '-no-emul-boot' + '-isohybrid-gpt-basdat' + ) fi _show_config iso - mkdir -p ${out_dir} + mkdir -p "${out_dir}" _msg_info "Creating ISO image..." local _qflag="" - if [[ ${quiet} == "y" ]]; then - _qflag="-quiet" + if [[ "${quiet}" == "y" ]]; then + xorriso -as mkisofs -quiet \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "${iso_label}" \ + -appid "${iso_application}" \ + -publisher "${iso_publisher}" \ + -preparer "prepared by mkarchiso" \ + -eltorito-boot isolinux/isolinux.bin \ + -eltorito-catalog isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table \ + -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \ + "${_iso_efi_boot_args[@]}" \ + -output "${out_dir}/${img_name}" \ + "${work_dir}/iso/" + else + xorriso -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "${iso_label}" \ + -appid "${iso_application}" \ + -publisher "${iso_publisher}" \ + -preparer "prepared by mkarchiso" \ + -eltorito-boot isolinux/isolinux.bin \ + -eltorito-catalog isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table \ + -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \ + "${_iso_efi_boot_args[@]}" \ + -output "${out_dir}/${img_name}" \ + "${work_dir}/iso/" fi - xorriso -as mkisofs ${_qflag} \ - -iso-level 3 \ - -full-iso9660-filenames \ - -volid "${iso_label}" \ - -appid "${iso_application}" \ - -publisher "${iso_publisher}" \ - -preparer "prepared by mkarchiso" \ - -eltorito-boot isolinux/isolinux.bin \ - -eltorito-catalog isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \ - ${_iso_efi_boot_args} \ - -output "${out_dir}/${img_name}" \ - "${work_dir}/iso/" - _msg_info "Done! | $(ls -sh ${out_dir}/${img_name})" + _msg_info "Done! | $(ls -sh "${out_dir}/${img_name}")" } # create airootfs.sfs filesystem, and push it in "iso" directory. @@ -322,13 +342,13 @@ command_prepare () { _show_config prepare _cleanup - if [[ ${sfs_mode} == "sfs" ]]; then + if [[ "${sfs_mode}" == "sfs" ]]; then _mkairootfs_sfs else _mkairootfs_img fi _mkchecksum - if [[ ${gpg_key} ]]; then + if [[ "${gpg_key}" ]]; then _mksignature fi } @@ -340,17 +360,14 @@ command_install () { _msg_error "Pacman config file '${pacman_conf}' does not exist" 1 fi - #trim spaces - pkg_list="$(echo ${pkg_list})" - - if [[ -z ${pkg_list} ]]; then + if [[ "${#pkg_list[@]}" -eq 0 ]]; then _msg_error "Packages must be specified" 0 _usage 1 fi _show_config install - _pacman "${pkg_list}" + _pacman "${pkg_list[@]}" } command_init() { @@ -363,7 +380,7 @@ command_run() { _chroot_run } -if [[ ${EUID} -ne 0 ]]; then +if [[ "${EUID}" -ne 0 ]]; then _msg_error "This script must be run as root." 1 fi @@ -371,7 +388,10 @@ umask 0022 while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do case "${arg}" in - p) pkg_list="${pkg_list} ${OPTARG}" ;; + p) + read -r -a opt_pkg_list <<< "${OPTARG}" + pkg_list+=("${opt_pkg_list[@]}") + ;; r) run_cmd="${OPTARG}" ;; C) pacman_conf="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; diff --git a/configs/baseline/airootfs/etc/shadow b/configs/baseline/airootfs/etc/shadow new file mode 100644 index 0000000..7edfd69 --- /dev/null +++ b/configs/baseline/airootfs/etc/shadow @@ -0,0 +1 @@ +root::14871:::::: diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 7c61d03..f2f3922 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -u @@ -10,58 +10,82 @@ arch=$(uname -m) work_dir=work out_dir=out -script_path=$(readlink -f ${0%/*}) +script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )" umask 0022 # Helper function to run make_*() only one time per architecture. run_once() { - if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then - $1 - touch ${work_dir}/build.${1}_${arch} + if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then + "$1" + touch "${work_dir}/build.${1}_${arch}" fi } -# Base installation (airootfs) -make_basefs() { - mkarchiso -v -w "${work_dir}" -D "${install_dir}" init +# Setup custom pacman.conf with current cache directories. +make_pacman_conf() { + local _cache_dirs + _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')") + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \ + "${script_path}/pacman.conf" > "${work_dir}/pacman.conf" +} + +# Prepare working directory and copy custom airootfs files (airootfs) +make_custom_airootfs() { + local _airootfs="${work_dir}/airootfs" + mkdir -p -- "${_airootfs}" + + if [[ -d "${script_path}/airootfs" ]]; then + cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}" + [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow" + [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow" + fi +} + +# Packages (airootfs) +make_packages() { + mkarchiso -v -w "${work_dir}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install } # Copy mkinitcpio archiso hooks and build initramfs (airootfs) make_setup_mkinitcpio() { - mkdir -p ${work_dir}/airootfs/etc/initcpio/hooks - mkdir -p ${work_dir}/airootfs/etc/initcpio/install - cp /usr/lib/initcpio/hooks/archiso ${work_dir}/airootfs/etc/initcpio/hooks - cp /usr/lib/initcpio/install/archiso ${work_dir}/airootfs/etc/initcpio/install - cp ${script_path}/mkinitcpio.conf ${work_dir}/airootfs/etc/mkinitcpio-archiso.conf - mkarchiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + mkdir -p "${work_dir}/airootfs/etc/initcpio/hooks" + mkdir -p "${work_dir}/airootfs/etc/initcpio/install" + cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks" + cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install" + cp "${script_path}/mkinitcpio.conf" "${work_dir}/airootfs/etc/mkinitcpio-archiso.conf" + mkarchiso -v -w "${work_dir}" -D "${install_dir}" \ + -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run } # Prepare ${install_dir}/boot/ make_boot() { - mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} - cp ${work_dir}/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img - cp ${work_dir}/airootfs/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz + mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}" + cp "${work_dir}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" + cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz" } # Prepare /${install_dir}/boot/syslinux make_syslinux() { - mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux + mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux" sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; - s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ + s|%ARCH%|${arch}|g" "${script_path}/syslinux/syslinux.cfg" > \ + "${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/" } # Prepare /isolinux make_isolinux() { - mkdir -p ${work_dir}/iso/isolinux - sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ - cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ + mkdir -p "${work_dir}/iso/isolinux" + sed "s|%INSTALL_DIR%|${install_dir}|g" "${script_path}/isolinux/isolinux.cfg" > \ + "${work_dir}/iso/isolinux/isolinux.cfg" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/" + cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/" } # Build airootfs filesystem image @@ -71,10 +95,13 @@ make_prepare() { # Build ISO make_iso() { - mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso" + mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso \ + "${iso_name}-${iso_version}-${arch}.iso" } -run_once make_basefs +run_once make_custom_airootfs +run_once make_pacman_conf +run_once make_packages run_once make_setup_mkinitcpio run_once make_boot run_once make_syslinux diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 new file mode 100644 index 0000000..d3ad7bf --- /dev/null +++ b/configs/baseline/packages.x86_64 @@ -0,0 +1,4 @@ +base +linux +mkinitcpio +syslinux diff --git a/configs/baseline/pacman.conf b/configs/baseline/pacman.conf new file mode 100644 index 0000000..bbca42f --- /dev/null +++ b/configs/baseline/pacman.conf @@ -0,0 +1,100 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +# We cannot check disk space from within a chroot environment +#CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 158a358..4f7ce4d 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,5 +1,9 @@ UI boot/syslinux/menu.c32 MENU TITLE Arch Linux +MENU CLEAR + +DEFAULT arch +TIMEOUT 30 LABEL arch MENU LABEL Arch Linux diff --git a/configs/releng/airootfs/etc/localtime b/configs/releng/airootfs/etc/localtime new file mode 120000 index 0000000..0e35b57 --- /dev/null +++ b/configs/releng/airootfs/etc/localtime @@ -0,0 +1 @@ +/usr/share/zoneinfo/UTC
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/motd b/configs/releng/airootfs/etc/motd new file mode 100644 index 0000000..417b050 --- /dev/null +++ b/configs/releng/airootfs/etc/motd @@ -0,0 +1,9 @@ +To install [38;2;23;147;209mArch Linux[0m follow the installation guide: +https://wiki.archlinux.org/index.php/Installation_guide + +For Wi-Fi, authenticate to the wireless network using the [35miwctl[0m utility. +Ethernet and Wi-Fi connections using DHCP should work automatically. + +After connecting to the internet, the installation guide can be accessed +via the convenience script [35mInstallation_guide[0m. + diff --git a/configs/releng/airootfs/etc/passwd b/configs/releng/airootfs/etc/passwd new file mode 100644 index 0000000..2807d5d --- /dev/null +++ b/configs/releng/airootfs/etc/passwd @@ -0,0 +1 @@ +root:x:0:0:root:/root:/usr/bin/zsh diff --git a/configs/releng/airootfs/etc/resolv.conf b/configs/releng/airootfs/etc/resolv.conf new file mode 120000 index 0000000..3639662 --- /dev/null +++ b/configs/releng/airootfs/etc/resolv.conf @@ -0,0 +1 @@ +/run/systemd/resolve/stub-resolv.conf
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/shadow b/configs/releng/airootfs/etc/shadow new file mode 100644 index 0000000..7edfd69 --- /dev/null +++ b/configs/releng/airootfs/etc/shadow @@ -0,0 +1 @@ +root::14871:::::: diff --git a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf new file mode 100644 index 0000000..b69850d --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf @@ -0,0 +1,2 @@ +[Journal] +Storage=volatile diff --git a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf new file mode 100644 index 0000000..f3ecb39 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf @@ -0,0 +1,4 @@ +[Login] +HandleSuspendKey=ignore +HandleHibernateKey=ignore +HandleLidSwitch=ignore diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network new file mode 100644 index 0000000..37878b0 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -0,0 +1,10 @@ +[Match] +Name=en* +Name=eth* + +[Network] +DHCP=yes +IPv6PrivacyExtensions=yes + +[DHCP] +RouteMetric=512 diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network new file mode 100644 index 0000000..e1d624c --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/network/20-wireless.network @@ -0,0 +1,10 @@ +[Match] +Name=wlp* +Name=wlan* + +[Network] +DHCP=yes +IPv6PrivacyExtensions=yes + +[DHCP] +RouteMetric=1024 diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service index 1e4d771..b6a3562 100644 --- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service +++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service @@ -4,7 +4,7 @@ ConditionKernelCommandLine=mirror [Service] Type=oneshot -ExecStart=/etc/systemd/scripts/choose-mirror +ExecStart=/usr/local/bin/choose-mirror [Install] WantedBy=multi-user.target diff --git a/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service new file mode 120000 index 0000000..4c158e6 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service new file mode 120000 index 0000000..4f6ae34 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-resolved.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/default.target b/configs/releng/airootfs/etc/systemd/system/default.target new file mode 120000 index 0000000..d321622 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/default.target @@ -0,0 +1 @@ +/usr/lib/systemd/system/multi-user.target
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service new file mode 120000 index 0000000..2d8d256 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service @@ -0,0 +1 @@ +../choose-mirror.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service new file mode 120000 index 0000000..3625abd --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/iwd.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service new file mode 120000 index 0000000..d09eec6 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service @@ -0,0 +1 @@ +../pacman-init.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service new file mode 120000 index 0000000..f5071ce --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service @@ -0,0 +1 @@ +../reflector.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service new file mode 120000 index 0000000..4c158e6 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service new file mode 120000 index 0000000..4f6ae34 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-resolved.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/configs/releng/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service new file mode 120000 index 0000000..7d6ad92 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd-wait-online.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 23b8144..6bc9aa0 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -10,6 +10,7 @@ Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/pacman-key --init ExecStart=/usr/bin/pacman-key --populate archlinux +ExecStart=/usr/bin/pacman-key --populate archlinux32 [Install] WantedBy=multi-user.target diff --git a/configs/releng/airootfs/etc/systemd/system/reflector.service b/configs/releng/airootfs/etc/systemd/system/reflector.service new file mode 100644 index 0000000..f7a88f2 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/reflector.service @@ -0,0 +1,41 @@ +[Unit] +Description=pacman mirrorlist update +Wants=network-online.target +After=network-online.target nss-lookup.target +ConditionKernelCommandLine=!mirror + +[Service] +Type=oneshot +ExecStart=/usr/bin/reflector --protocol https --age 1 --sort rate --save /etc/pacman.d/mirrorlist +Restart=on-failure +RestartSec=10 +CacheDirectory=reflector +CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM +Environment=XDG_CACHE_HOME=/var/cache/reflector +LockPersonality=true +MemoryDenyWriteExecute=true +NoNewPrivileges=true +PrivateDevices=true +PrivateTmp=true +PrivateUsers=true +ProtectClock=true +ProtectControlGroups=true +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelLogs=true +ProtectKernelModules=true +ProtectSystem=strict +ReadWritePaths=/etc/pacman.d/mirrorlist +RemoveIPC=true +RestrictAddressFamilies=~AF_AX25 AF_IPX AF_APPLETALK AF_X25 AF_DECnet AF_KEY AF_NETLINK AF_PACKET AF_RDS AF_PPPOX AF_LLC AF_IB AF_MPLS AF_CAN AF_TIPC AF_BLUETOOTH AF_ALG AF_VSOCK AF_KCM AF_UNIX AF_XDP +RestrictNamespaces=true +RestrictRealtime=true +RestrictSUIDSGID=true +SystemCallArchitectures=native +SystemCallFilter=@system-service +SystemCallFilter=~@resources @privileged +UMask=177 + +[Install] +WantedBy=multi-user.target diff --git a/configs/releng/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/configs/releng/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 0000000..51942c8 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.socket
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf new file mode 100644 index 0000000..c875311 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules deleted file mode 100644 index 1c4053c..0000000 --- a/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service" diff --git a/configs/releng/airootfs/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh index 81a98a1..ed3a924 100755 --- a/configs/releng/airootfs/root/.automated_script.sh +++ b/configs/releng/airootfs/root/.automated_script.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash script_cmdline () { @@ -15,8 +15,8 @@ automated_script () local script rt script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then - if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then - wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null + if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then + curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null rt=$? else cp "${script}" /tmp/startup_script diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index bf5210c..5c98fd6 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -1,23 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -u sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -ln -sf /usr/share/zoneinfo/UTC /etc/localtime - -usermod -s /usr/bin/zsh root cp -aT /etc/skel/ /root/ -chmod 700 /root sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf - -sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf -sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf - -systemctl enable pacman-init.service choose-mirror.service -systemctl set-default multi-user.target diff --git a/configs/releng/airootfs/root/install.txt b/configs/releng/airootfs/root/install.txt deleted file mode 100644 index 3c8f171..0000000 --- a/configs/releng/airootfs/root/install.txt +++ /dev/null @@ -1,3 +0,0 @@ -View this installation guide online at -https://wiki.archlinux.org/index.php/Installation_Guide - diff --git a/configs/releng/airootfs/usr/local/bin/Installation_guide b/configs/releng/airootfs/usr/local/bin/Installation_guide new file mode 100755 index 0000000..cd38645 --- /dev/null +++ b/configs/releng/airootfs/usr/local/bin/Installation_guide @@ -0,0 +1,3 @@ +#!/bin/sh + +exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide' diff --git a/configs/releng/airootfs/etc/systemd/scripts/choose-mirror b/configs/releng/airootfs/usr/local/bin/choose-mirror index 0ae0806..0ae0806 100755 --- a/configs/releng/airootfs/etc/systemd/scripts/choose-mirror +++ b/configs/releng/airootfs/usr/local/bin/choose-mirror diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 659e8de..99e0dbd 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e -u @@ -10,10 +10,11 @@ iso_version=$(date +%Y.%m.%d) install_dir=arch work_dir=work out_dir=out -gpg_key= +gpg_key="" +arch=$(uname -m) verbose="" -script_path=$(readlink -f ${0%/*}) +script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )" umask 0022 @@ -40,188 +41,245 @@ _usage () echo " Default: ${out_dir}" echo " -v Enable verbose output" echo " -h This help message" - exit ${1} + exit "${1}" } # Helper function to run make_*() only one time per architecture. run_once() { - if [[ ! -e ${work_dir}/build.${1} ]]; then - $1 - touch ${work_dir}/build.${1} + if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then + "$1" + touch "${work_dir}/build.${1}_${arch}" fi } -# Setup custom pacman.conf with current cache directories. +# Setup custom pacman.conf with current cache directories and custom mirrorlist and custom architecture. make_pacman_conf() { local _cache_dirs - _cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')) - sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${work_dir}/pacman.conf + _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')") + sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \ + "${script_path}/pacman.conf" > "${work_dir}/pacman-x86_64.conf" + sed ' + s@/var/cache/pacman/pkg/@/var/cache/archbuild32/@ + s@Include = /etc/pacman\.d/mirrorlist$@\032@ + ' "${work_dir}/pacman-x86_64.conf" > "${work_dir}/pacman-i686.conf" + local _conf + for _conf in "${work_dir}/"pacman-*.conf; do + sed -i ' + /^Architecture =/ s/=.*$/= '"${_conf##*/pacman-}"'/ + T + s/\.conf$// + ' "${_conf}" + done } -# Base installation, plus needed packages (airootfs) -make_basefs() { - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install +# Prepare working directory and copy custom airootfs files (airootfs) +make_custom_airootfs() { + local _airootfs="${work_dir}/${arch}/airootfs" + mkdir -p -- "${_airootfs}" + + if [[ -d "${script_path}/airootfs" ]]; then + cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}" + + [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow" + [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow" + [[ -e "${_airootfs}/root" ]] && chmod -f 0750 -- "${_airootfs}/root" + fi } -# Additional packages (airootfs) +# Packages (airootfs) make_packages() { - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.x86_64)" install + if [ -n "${verbose}" ]; then + arch=${arch} mkarchiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" \ + -p "$(grep -h -v '^#' "${script_path}/packages."{both,${arch}}| sed ':a;N;$!ba;s/\n/ /g')" install + else + arch=${arch} mkarchiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" \ + -p "$(grep -h -v '^#' "${script_path}/packages."{both,${arch}}| sed ':a;N;$!ba;s/\n/ /g')" install + fi +} + +# Needed packages for x86_64 EFI boot +make_packages_efi() { + if [ -n "${verbose}" ]; then + arch=${arch} mkarchiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "efitools" install + else + arch=${arch} mkarchiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "efitools" install + fi } # Copy mkinitcpio archiso hooks and build initramfs (airootfs) make_setup_mkinitcpio() { local _hook - mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/hooks - mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/install + mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/hooks" + mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/install" for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do - cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/hooks - cp /usr/lib/initcpio/install/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/install + cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/hooks" + cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/install" done - sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown - cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/x86_64/airootfs/etc/initcpio/install - cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/x86_64/airootfs/etc/initcpio - cp ${script_path}/mkinitcpio.conf ${work_dir}/x86_64/airootfs/etc/mkinitcpio-archiso.conf - gnupg_fd= - if [[ ${gpg_key} ]]; then - gpg --export ${gpg_key} >${work_dir}/gpgkey - exec 17<>${work_dir}/gpgkey + sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/${arch}/airootfs/etc/initcpio/install/archiso_shutdown" + cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/${arch}/airootfs/etc/initcpio/install" + cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/${arch}/airootfs/etc/initcpio" + cp ${script_path}/mkinitcpio.conf "${work_dir}/${arch}/airootfs/etc/mkinitcpio-archiso.conf" + if [[ "${gpg_key}" ]]; then + gpg --export "${gpg_key}" > "${work_dir}/gpgkey" + exec 17<>"${work_dir}/gpgkey" fi - ARCHISO_GNUPG_FD=${gpg_key:+17} mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run - if [[ ${gpg_key} ]]; then + if [ -n "${verbose}" ]; then + ARCHISO_GNUPG_FD="${gpg_key:+17}" arch=${arch} mkarchiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" \ + -D "${install_dir}" \ + -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + else + ARCHISO_GNUPG_FD="${gpg_key:+17}" arch=${arch} mkarchiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" \ + -D "${install_dir}" \ + -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + fi + if [[ "${gpg_key}" ]]; then exec 17<&- fi } # Customize installation (airootfs) make_customize_airootfs() { - cp -af ${script_path}/airootfs ${work_dir}/x86_64 - - cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc - - curl -o ${work_dir}/x86_64/airootfs/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' - - lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt - - mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r '/root/customize_airootfs.sh' run - rm ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh + if [ -n "${verbose}" ]; then + arch=${arch} mkarchiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + else + arch=${arch} mkarchiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + fi + rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" } # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { - mkdir -p ${work_dir}/iso/${install_dir}/boot/x86_64 - cp ${work_dir}/x86_64/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img - cp ${work_dir}/x86_64/airootfs/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz + mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}" + cp "${work_dir}/${arch}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" + cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz" } # Add other aditional/extra files to ${install_dir}/boot/ make_boot_extra() { - cp ${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest - cp ${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING - cp ${work_dir}/x86_64/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img - cp ${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE - cp ${work_dir}/x86_64/airootfs/boot/amd-ucode.img ${work_dir}/iso/${install_dir}/boot/amd_ucode.img - cp ${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE + if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then + cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest" + cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \ + "${work_dir}/iso/${install_dir}/boot/memtest.COPYING" + fi + if [[ -e "${work_dir}/${arch}/airootfs/boot/intel-ucode.img" ]]; then + cp "${work_dir}/${arch}/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" + cp "${work_dir}/${arch}/airootfs/usr/share/licenses/intel-ucode/LICENSE" \ + "${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE" + fi + if [[ -e "${work_dir}/${arch}/airootfs/boot/amd-ucode.img" ]]; then + cp "${work_dir}/${arch}/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" + cp "${work_dir}/${arch}/airootfs/usr/share/licenses/amd-ucode/LICENSE" \ + "${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE" + fi } # Prepare /${install_dir}/boot/syslinux make_syslinux() { - _uname_r=$(file -b ${work_dir}/x86_64/airootfs/boot/vmlinuz-linux| awk 'f{print;f=0} /version/{f=1}' RS=' ') - mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux - for _cfg in ${script_path}/syslinux/*.cfg; do + _uname_r=$(file -b "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ') + mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux" + for _cfg in "${script_path}/syslinux/"*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/} + s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}" done - cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux - mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt - gzip -c -9 ${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz - gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz + cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux" + mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt" + gzip -c -9 "${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids" > \ + "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz" + gzip -c -9 "${work_dir}/${arch}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \ + "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz" } # Prepare /isolinux make_isolinux() { - mkdir -p ${work_dir}/iso/isolinux - sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ - cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ + mkdir -p "${work_dir}/iso/isolinux" + sed "s|%INSTALL_DIR%|${install_dir}|g" \ + "${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/" + cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/" } # Prepare /EFI make_efi() { - mkdir -p ${work_dir}/iso/EFI/boot - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/iso/EFI/boot/ - - cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/loader.efi + mkdir -p "${work_dir}/iso/EFI/boot" + cp "${work_dir}/i686/airootfs/usr/lib/systemd/boot/efi/systemd-bootia32.efi" \ + "${work_dir}/iso/EFI/boot/bootia32.efi" - mkdir -p ${work_dir}/iso/loader/entries - cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/ + mkdir -p "${work_dir}/iso/loader/entries" + cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/" sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ - ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf + "${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \ + "${work_dir}/iso/loader/entries/archiso-x86_64.conf" - # EFI Shell 2.0 for UEFI 2.3+ - curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/ShellBinPkg/UefiShell/X64/Shell.efi - # EFI Shell 1.0 for non UEFI 2.3+ - curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + # edk2-shell based UEFI shell + # shellx64.efi is picked up automatically when on / + cp /usr/share/edk2-shell/x64/Shell_Full.efi "${work_dir}/iso/shellx64.efi" } # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode make_efiboot() { - mkdir -p ${work_dir}/iso/EFI/archiso - truncate -s 64M ${work_dir}/iso/EFI/archiso/efiboot.img - mkfs.fat -n ARCHISO_EFI ${work_dir}/iso/EFI/archiso/efiboot.img + mkdir -p "${work_dir}/iso/EFI/archiso" + truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img" + mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img" - mkdir -p ${work_dir}/efiboot - mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot + mkdir -p "${work_dir}/efiboot" + mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot" - mkdir -p ${work_dir}/efiboot/EFI/archiso - cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi - cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img + mkdir -p "${work_dir}/efiboot/EFI/archiso" + cp "${work_dir}/iso/${install_dir}/boot/i686/vmlinuz" "${work_dir}/efiboot/EFI/archiso/vmlinuz.efi" + cp "${work_dir}/iso/${install_dir}/boot/i686/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" - cp ${work_dir}/iso/${install_dir}/boot/intel_ucode.img ${work_dir}/efiboot/EFI/archiso/intel_ucode.img - cp ${work_dir}/iso/${install_dir}/boot/amd_ucode.img ${work_dir}/efiboot/EFI/archiso/amd_ucode.img + cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img" + cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img" - mkdir -p ${work_dir}/efiboot/EFI/boot - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi - cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/efiboot/EFI/boot/ + mkdir -p "${work_dir}/efiboot/EFI/boot" + cp "${work_dir}/i686/airootfs/usr/lib/systemd/boot/efi/systemd-bootia32.efi" \ + "${work_dir}/efiboot/EFI/boot/bootia32.efi" - cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi - - mkdir -p ${work_dir}/efiboot/loader/entries - cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/ + mkdir -p "${work_dir}/efiboot/loader/entries" + cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/" sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ - ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf + "${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \ + "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf" - cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ - cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ + # shellx64.efi is picked up automatically when on / + cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/" - umount -d ${work_dir}/efiboot + umount -d "${work_dir}/efiboot" } # Build airootfs filesystem image make_prepare() { - cp -a -l -f ${work_dir}/x86_64/airootfs ${work_dir} - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare - rm -rf ${work_dir}/airootfs - # rm -rf ${work_dir}/x86_64/airootfs (if low space, this helps) + cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}" + if [ -n "${verbose}" ]; then + arch=${arch} mkarchiso -v -w "${work_dir}" -D "${install_dir}" pkglist + arch=${arch} mkarchiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare + else + arch=${arch} mkarchiso -w "${work_dir}" -D "${install_dir}" pkglist + arch=${arch} mkarchiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare + fi + rm -rf "${work_dir}/airootfs" + # rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps) } # Build ISO make_iso() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso" + if [ -n "${verbose}" ]; then + arch=${arch} mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \ + -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-i686.iso" + else + arch=${arch} mkarchiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \ + -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-i686.iso" + fi } if [[ ${EUID} -ne 0 ]]; then @@ -249,18 +307,36 @@ while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do esac done -mkdir -p ${work_dir} +mkdir -p "${work_dir}" run_once make_pacman_conf -run_once make_basefs -run_once make_packages -run_once make_setup_mkinitcpio -run_once make_customize_airootfs -run_once make_boot + +# Do all stuff for each airootfs +for arch in i686; do + run_once make_custom_airootfs + run_once make_packages +done + +run_once make_packages_efi + +for arch in i686; do + run_once make_setup_mkinitcpio + run_once make_customize_airootfs +done + +for arch in i686; do + run_once make_boot +done + +# Do all stuff for "iso" run_once make_boot_extra run_once make_syslinux run_once make_isolinux run_once make_efi run_once make_efiboot -run_once make_prepare + +for arch in i686; do + run_once make_prepare +done + run_once make_iso diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index b77ed98..7f5c81b 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,4 +1,4 @@ -title Arch Linux archiso x86_64 UEFI CD +title Arch Linux install medium (x86_64, UEFI) linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/intel_ucode.img initrd /EFI/archiso/amd_ucode.img diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index 09adca4..e1d156a 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,4 +1,4 @@ -title Arch Linux archiso x86_64 UEFI USB +title Arch Linux install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz initrd /%INSTALL_DIR%/boot/intel_ucode.img initrd /%INSTALL_DIR%/boot/amd_ucode.img diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf deleted file mode 100644 index 9597ff2..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v1 -efi /EFI/shellx64_v1.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf deleted file mode 100644 index 0dde77a..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v2 -efi /EFI/shellx64_v2.efi diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 62c4a83..9a0049c 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,2 @@ timeout 3 -default archiso-x86_64 +default archiso-x86_64.conf diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.both index 37fea54..1cfd724 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.both @@ -1,5 +1,8 @@ +amd-ucode arch-install-scripts b43-fwcutter +base +bind-tools broadcom-wl btrfs-progs clonezilla @@ -8,13 +11,11 @@ darkhttpd ddrescue dhclient dhcpcd -dialog diffutils dmraid dnsmasq -dnsutils dosfstools -elinks +efibootmgr ethtool exfat-utils f2fs-tools @@ -23,31 +24,38 @@ gnu-netcat gpm gptfdisk grml-zsh-config -grub +haveged hdparm +intel-ucode ipw2100-fw ipw2200-fw irssi iwd jfsutils +kitty-terminfo lftp +linux linux-atm linux-firmware lsscsi lvm2 +lynx man-db man-pages mc mdadm +memtest86+ +mkinitcpio +mkinitcpio-nfs-utils mtools nano +nbd ndisc6 -netctl nfs-utils nilfs-utils nmap ntfs-3g -ntp +nvme-cli openconnect openssh openvpn @@ -56,25 +64,29 @@ parted partimage ppp pptpclient -refind +reflector reiserfsprogs rp-pppoe rsync +rxvt-unicode-terminfo sdparm sg3_utils smartmontools sudo +syslinux +systemd-resolvconf tcpdump +terminus-font +termite-terminfo testdisk usb_modeswitch usbutils -vi -vim-minimal +vim vpnc -wget wireless-regdb wireless_tools wpa_supplicant wvdial xfsprogs xl2tpd +zsh diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/configs/releng/packages.i686 diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index c678d01..bbca42f 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index 81ad26e..a915d34 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -23,3 +23,5 @@ MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std MENU COLOR msg07 37;40 #90ffffff #a0000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +MENU CLEAR diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index 92af749..b0e66e8 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -1,35 +1,35 @@ INCLUDE boot/syslinux/archiso_head.cfg -LABEL arch64_nbd +LABEL arch32_nbd TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NBD). +Boot the Arch Linux (i686) live medium (Using NBD). It allows you to install Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (NBD) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot Arch Linux (i686) (NBD) +LINUX boot/i686/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} SYSAPPEND 3 -LABEL arch64_nfs +LABEL arch32_nfs TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NFS). +Boot the Arch Linux (i686) live medium (Using NFS). It allows you to install Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (NFS) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot Arch Linux (i686) (NFS) +LINUX boot/i686/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt SYSAPPEND 3 -LABEL arch64_http +LABEL arch32_http TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using HTTP). +Boot the Arch Linux (i686) live medium (Using HTTP). It allows you to install Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (HTTP) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot Arch Linux (i686) (HTTP) +LINUX boot/i686/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 diff --git a/configs/releng/syslinux/archiso_pxe_32_inc.cfg b/configs/releng/syslinux/archiso_pxe_32_inc.cfg new file mode 100644 index 0000000..e4115df --- /dev/null +++ b/configs/releng/syslinux/archiso_pxe_32_inc.cfg @@ -0,0 +1,3 @@ +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_pxe32.cfg +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index a35a1ea..62bba0b 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -1,13 +1,13 @@ INCLUDE boot/syslinux/archiso_head.cfg -LABEL arch64 +LABEL arch32 TEXT HELP -Boot the Arch Linux (x86_64) live medium. +Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot Arch Linux (i686) +LINUX boot/i686/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_sys_32_inc.cfg b/configs/releng/syslinux/archiso_sys_32_inc.cfg new file mode 100644 index 0000000..9e37093 --- /dev/null +++ b/configs/releng/syslinux/archiso_sys_32_inc.cfg @@ -0,0 +1,3 @@ +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_sys32.cfg +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index e85d8e1..34b6c5b 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -19,9 +19,17 @@ COM32 boot/syslinux/hdt.c32 APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz LABEL reboot +TEXT HELP +Reboot computer. +The computer's firmware must support APM. +ENDTEXT MENU LABEL Reboot COM32 boot/syslinux/reboot.c32 LABEL poweroff +TEXT HELP +Power off computer. +The computer's firmware must support APM. +ENDTEXT MENU LABEL Power Off COM32 boot/syslinux/poweroff.c32 diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods index 544e49b..beb6f0d 100644 --- a/docs/README.altbootmethods +++ b/docs/README.altbootmethods @@ -13,7 +13,7 @@ INDEX *** Alternative boot methods (configs/releng) -ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-x86_64.iso +ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-i686.iso Where: <YYYY> Year @@ -24,15 +24,15 @@ Where: ** ISO in loopback mode. Note: Described method is for using with GRUB2. - GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-x86_64.iso + GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-i686.iso is at path <TARGET-PATH> on disk <D> and partition <P>, where filesystem is labeled as <TARGET-FS-LABEL>. -menuentry "Arch Linux (x86_64)" { - set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-x86_64.iso" +menuentry "Arch Linux (i686)" { + set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-i686.iso" loopback loop (hd<D>,<P>)$isofile - linux (loop)/arch/boot/x86_64/vmlinuz img_label=<TARGET-FS-LABEL> img_loop=$isofile - initrd (loop)/arch/boot/x86_64/archiso.img + linux (loop)/arch/boot/i686/vmlinuz img_label=<TARGET-FS-LABEL> img_loop=$isofile + initrd (loop)/arch/boot/i686/archiso.img } @@ -40,13 +40,15 @@ menuentry "Arch Linux (x86_64)" { Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX can work with other bootloaders. - SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-x86_64.iso + SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-i686.iso is at path <TARGET-PATH>. + On 32-bit systems, is needed to pass vmalloc=nnM to the kernel, where nn is the size + of the ISO image plus 64 MiB (or 128 MiB). -LABEL arch_x64 +LABEL arch_x32 LINUX memdisk - INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-x86_64.iso + INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-i686.iso APPEND iso diff --git a/docs/README.build b/docs/README.build index 8055d1b..efa78d0 100644 --- a/docs/README.build +++ b/docs/README.build @@ -11,6 +11,7 @@ INDEX ** For mkarchiso script needs these packages (build host): + arch-install-scripts for pacstrap/arch-chroot + + edk2-shell for UEFI shell + squashfs-tools for mksquashfs + libisoburn for xorriso + btrfs-progs for mkfs.btrfs (optional) diff --git a/docs/README.transfer b/docs/README.transfer index f366061..2bb2b3d 100644 --- a/docs/README.transfer +++ b/docs/README.transfer @@ -13,7 +13,7 @@ INDEX *** Transfer ISO image to target medium (configs/releng) -ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-x86_64.iso +ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-i686.iso Where: <YYYY> Year @@ -34,7 +34,7 @@ Nomeclature: 1) Write it directly using your favorite recording program. -# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-x86_64.iso +# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-i686.iso ** To -> USB Flash Drive (USB-key) / Memory card (SD) / @@ -53,8 +53,8 @@ Nomeclature: (example: /dev/sdx1) <MNT-TARGET-N>: Mount point path where <DEV-TARGET-N> is mounted (example: /mnt/sdx/1) -<ISO-SOURCE>: Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-x86_64.iso - (example: ~/archlinux-2017.03.01-x86_64.iso) +<ISO-SOURCE>: Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-i686.iso + (example: ~/archlinux-2017.03.01-i686.iso) <FS-LABEL>: Represents the filesystem label of the <ISO-SOURCE> (example: ARCH_201703) diff --git a/scripts/run_archiso.sh b/scripts/run_archiso.sh new file mode 100755 index 0000000..210246c --- /dev/null +++ b/scripts/run_archiso.sh @@ -0,0 +1,155 @@ +#!/usr/bin/env bash +# +# Copyright (C) 2020 David Runge <dvzrv@archlinux.org> +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# A simple script to run an archiso image using qemu. The image can be booted +# using BIOS or UEFI. +# +# Requirements: +# - qemu +# - edk2-ovmf (when UEFI booting) + + +set -eu + +print_help() { + cat << EOF +Usage: + run_archiso [options] + +Options: + -b set boot type to 'bios' (default) + -h print help + -i [image] image to boot into + -s use secure boot (only relevant when using UEFI) + -u set boot type to 'uefi' + +Example: + Run an image using UEFI: + $ run_archiso -u -i archiso-2020.05.23-x86_64.iso +EOF +} + +cleanup_working_dir() { + if [ -d "${working_dir}" ]; then + rm -rf "${working_dir}" + fi +} + +copy_ovmf_vars() { + if [ ! -f /usr/share/edk2-ovmf/x64/OVMF_VARS.fd ]; then + echo "ERROR: OVMF_VARS.fd not found. Install edk2-ovmf." + exit 1 + fi + cp -av /usr/share/edk2-ovmf/x64/OVMF_VARS.fd "${working_dir}" +} + +check_image() { + if [ -z "$image" ]; then + echo "ERROR: Image name can not be empty." + exit 1 + fi + if [ ! -f "$image" ]; then + echo "ERROR: Image file ($image) does not exist." + exit 1 + fi +} + +run_image() { + [ "$boot_type" == "bios" ] && run_image_using_bios + [ "$boot_type" == "uefi" ] && run_image_using_uefi +} + +run_image_using_bios() { + qemu-system-x86_64 \ + -boot order=d,menu=on,reboot-timeout=5000 \ + -m size=3072,slots=0,maxmem=$((3072*1024*1024)) \ + -k en \ + -name archiso,process=archiso_0 \ + -drive file="${image}",media=cdrom,readonly=on,if=virtio \ + -display sdl \ + -vga virtio \ + -device virtio-net-pci,netdev=net0 -netdev user,id=net0 \ + -enable-kvm \ + -no-reboot +} + +run_image_using_uefi() { + local ovmf_code=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd + local secure_boot_state=off + copy_ovmf_vars + if [ "${secure_boot}" == "yes" ]; then + echo "Using Secure Boot" + ovmf_code=/usr/share/edk2-ovmf/x64/OVMF_CODE.secboot.fd + secure_boot_state=on + fi + qemu-system-x86_64 \ + -boot order=d,menu=on,reboot-timeout=5000 \ + -m size=3072,slots=0,maxmem=$((3072*1024*1024)) \ + -k en \ + -name archiso,process=archiso_0 \ + -drive file="${image}",media=cdrom,readonly=on,if=virtio \ + -drive if=pflash,format=raw,unit=0,file="${ovmf_code}",readonly \ + -drive if=pflash,format=raw,unit=1,file="${working_dir}/OVMF_VARS.fd" \ + -machine type=q35,smm=on,accel=kvm \ + -global driver=cfi.pflash01,property=secure,value="${secure_boot_state}" \ + -global ICH9-LPC.disable_s3=1 \ + -display sdl \ + -vga virtio \ + -device virtio-net-pci,netdev=net0 -netdev user,id=net0 \ + -enable-kvm \ + -no-reboot +} + +set_image() { + if [ -z "$image" ]; then + echo "ERROR: Image name can not be empty." + exit 1 + fi + if [ ! -f "$image" ]; then + echo "ERROR: Image ($image) does not exist." + exit 1 + fi + image="$1" +} + +image="" +boot_type="bios" +secure_boot="no" +working_dir="$(mktemp -d)" +trap cleanup_working_dir EXIT + +if [ ${#@} -gt 0 ]; then + while getopts 'bhi:su' flag; do + case "${flag}" in + b) + boot_type=bios + ;; + h) + print_help + exit 0 + ;; + i) + image="$OPTARG" + ;; + u) + boot_type=uefi + ;; + s) + secure_boot=yes + ;; + *) + echo "Error: Wrong option. Try 'run_archiso -h'." + exit 1 + ;; + esac + done +else + print_help + exit 1 +fi + +check_image +run_image |