From 60195e63c40ba5f9035bfdb1b06cdfdff3f9a096 Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Wed, 13 Mar 2013 20:28:56 -0300 Subject: Replace string in all filenames: archiso -> parabolaiso --- archiso/initcpio/hooks/archiso | 208 -------- archiso/initcpio/hooks/archiso_loop_mnt | 32 -- archiso/initcpio/hooks/archiso_pxe_common | 50 -- archiso/initcpio/hooks/archiso_pxe_http | 61 --- archiso/initcpio/hooks/archiso_pxe_nbd | 40 -- archiso/initcpio/hooks/archiso_pxe_nfs | 30 -- archiso/initcpio/hooks/archiso_shutdown | 6 - archiso/initcpio/install/archiso | 22 - archiso/initcpio/install/archiso_kms | 26 - archiso/initcpio/install/archiso_loop_mnt | 13 - archiso/initcpio/install/archiso_pxe_common | 26 - archiso/initcpio/install/archiso_pxe_http | 15 - archiso/initcpio/install/archiso_pxe_nbd | 17 - archiso/initcpio/install/archiso_pxe_nfs | 17 - archiso/initcpio/install/archiso_shutdown | 20 - archiso/initcpio/script/archiso_shutdown | 37 -- archiso/mkarchiso | 584 --------------------- .../efiboot/loader/entries/archiso-x86_64-cd.conf | 4 - .../efiboot/loader/entries/archiso-x86_64-usb.conf | 4 - .../loader/entries/parabolaiso-x86_64-cd.conf | 4 + .../loader/entries/parabolaiso-x86_64-usb.conf | 4 + configs/releng/syslinux/archiso.cfg | 11 - configs/releng/syslinux/archiso_head.cfg | 25 - configs/releng/syslinux/archiso_pxe32.cfg | 32 -- configs/releng/syslinux/archiso_pxe64.cfg | 32 -- configs/releng/syslinux/archiso_pxe_32_inc.cfg | 3 - configs/releng/syslinux/archiso_pxe_both_inc.cfg | 4 - configs/releng/syslinux/archiso_pxe_choose.cfg | 11 - configs/releng/syslinux/archiso_sys32.cfg | 9 - configs/releng/syslinux/archiso_sys64.cfg | 9 - configs/releng/syslinux/archiso_sys_32_inc.cfg | 3 - configs/releng/syslinux/archiso_sys_both_inc.cfg | 4 - configs/releng/syslinux/archiso_sys_choose.cfg | 11 - configs/releng/syslinux/archiso_tail.cfg | 27 - configs/releng/syslinux/parabolaiso.cfg | 11 + configs/releng/syslinux/parabolaiso_head.cfg | 25 + configs/releng/syslinux/parabolaiso_pxe32.cfg | 32 ++ configs/releng/syslinux/parabolaiso_pxe64.cfg | 32 ++ configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg | 3 + .../releng/syslinux/parabolaiso_pxe_both_inc.cfg | 4 + configs/releng/syslinux/parabolaiso_pxe_choose.cfg | 11 + configs/releng/syslinux/parabolaiso_sys32.cfg | 9 + configs/releng/syslinux/parabolaiso_sys64.cfg | 9 + configs/releng/syslinux/parabolaiso_sys_32_inc.cfg | 3 + .../releng/syslinux/parabolaiso_sys_both_inc.cfg | 4 + configs/releng/syslinux/parabolaiso_sys_choose.cfg | 11 + configs/releng/syslinux/parabolaiso_tail.cfg | 27 + parabolaiso/initcpio/hooks/parabolaiso | 208 ++++++++ parabolaiso/initcpio/hooks/parabolaiso_loop_mnt | 32 ++ parabolaiso/initcpio/hooks/parabolaiso_pxe_common | 50 ++ parabolaiso/initcpio/hooks/parabolaiso_pxe_http | 61 +++ parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd | 40 ++ parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs | 30 ++ parabolaiso/initcpio/hooks/parabolaiso_shutdown | 6 + parabolaiso/initcpio/install/parabolaiso | 22 + parabolaiso/initcpio/install/parabolaiso_kms | 26 + parabolaiso/initcpio/install/parabolaiso_loop_mnt | 13 + .../initcpio/install/parabolaiso_pxe_common | 26 + parabolaiso/initcpio/install/parabolaiso_pxe_http | 15 + parabolaiso/initcpio/install/parabolaiso_pxe_nbd | 17 + parabolaiso/initcpio/install/parabolaiso_pxe_nfs | 17 + parabolaiso/initcpio/install/parabolaiso_shutdown | 20 + parabolaiso/initcpio/script/parabolaiso_shutdown | 37 ++ parabolaiso/mkparabolaiso | 584 +++++++++++++++++++++ 64 files changed, 1393 insertions(+), 1393 deletions(-) delete mode 100644 archiso/initcpio/hooks/archiso delete mode 100644 archiso/initcpio/hooks/archiso_loop_mnt delete mode 100644 archiso/initcpio/hooks/archiso_pxe_common delete mode 100644 archiso/initcpio/hooks/archiso_pxe_http delete mode 100644 archiso/initcpio/hooks/archiso_pxe_nbd delete mode 100644 archiso/initcpio/hooks/archiso_pxe_nfs delete mode 100644 archiso/initcpio/hooks/archiso_shutdown delete mode 100644 archiso/initcpio/install/archiso delete mode 100644 archiso/initcpio/install/archiso_kms delete mode 100644 archiso/initcpio/install/archiso_loop_mnt delete mode 100644 archiso/initcpio/install/archiso_pxe_common delete mode 100644 archiso/initcpio/install/archiso_pxe_http delete mode 100644 archiso/initcpio/install/archiso_pxe_nbd delete mode 100644 archiso/initcpio/install/archiso_pxe_nfs delete mode 100644 archiso/initcpio/install/archiso_shutdown delete mode 100644 archiso/initcpio/script/archiso_shutdown delete mode 100755 archiso/mkarchiso delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf create mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf delete mode 100644 configs/releng/syslinux/archiso.cfg delete mode 100644 configs/releng/syslinux/archiso_head.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe32.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe64.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_32_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_both_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_choose.cfg delete mode 100644 configs/releng/syslinux/archiso_sys32.cfg delete mode 100644 configs/releng/syslinux/archiso_sys64.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_32_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_both_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_choose.cfg delete mode 100644 configs/releng/syslinux/archiso_tail.cfg create mode 100644 configs/releng/syslinux/parabolaiso.cfg create mode 100644 configs/releng/syslinux/parabolaiso_head.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe32.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe64.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg create mode 100644 configs/releng/syslinux/parabolaiso_pxe_choose.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys32.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys64.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys_32_inc.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys_both_inc.cfg create mode 100644 configs/releng/syslinux/parabolaiso_sys_choose.cfg create mode 100644 configs/releng/syslinux/parabolaiso_tail.cfg create mode 100644 parabolaiso/initcpio/hooks/parabolaiso create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_loop_mnt create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_pxe_common create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_pxe_http create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs create mode 100644 parabolaiso/initcpio/hooks/parabolaiso_shutdown create mode 100644 parabolaiso/initcpio/install/parabolaiso create mode 100644 parabolaiso/initcpio/install/parabolaiso_kms create mode 100644 parabolaiso/initcpio/install/parabolaiso_loop_mnt create mode 100644 parabolaiso/initcpio/install/parabolaiso_pxe_common create mode 100644 parabolaiso/initcpio/install/parabolaiso_pxe_http create mode 100644 parabolaiso/initcpio/install/parabolaiso_pxe_nbd create mode 100644 parabolaiso/initcpio/install/parabolaiso_pxe_nfs create mode 100644 parabolaiso/initcpio/install/parabolaiso_shutdown create mode 100644 parabolaiso/initcpio/script/parabolaiso_shutdown create mode 100755 parabolaiso/mkparabolaiso diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso deleted file mode 100644 index c23fd3d..0000000 --- a/archiso/initcpio/hooks/archiso +++ /dev/null @@ -1,208 +0,0 @@ -# args: source, newroot, mountpoint -_mnt_fs() { - local img="${1}" - local newroot="${2}" - local mnt="${3}" - local img_fullname="${img##*/}"; - local img_name="${img_fullname%%.*}" - local dm_snap_name="${dm_snap_prefix}_${img_name}" - local ro_dev ro_dev_size rw_dev - - ro_dev=$(losetup --find --show --read-only "${img}") - echo ${ro_dev} >> /run/parabolaiso/used_block_devices - ro_dev_size=$(blockdev --getsz ${ro_dev}) - if [[ "${cowfile_size}" == "100" ]]; then - rw_dev_size=${ro_dev_size} - else - # size calculation done in this way to avoid integer overflow when ro_dev_size is > 10.2G - rw_dev_size=$((ro_dev_size/100*cowfile_size)) - fi - - if [[ "${cow_persistent}" == "P" ]]; then - if [[ -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then - msg ":: Found '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent." - else - msg ":: Creating '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow' as persistent." - dd of="/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null - fi - else - if [[ -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then - msg ":: Found '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow' but non-persistent requested, removing." - rm -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" - fi - msg ":: Creating '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent." - dd of="/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null - fi - - rw_dev=$(losetup --find --show "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow") - echo ${rw_dev} >> /run/parabolaiso/used_block_devices - - echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name} - - _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" - echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/parabolaiso/used_block_devices -} - -# args: /path/to/image_file, mountpoint -_mnt_sfs() { - local img="${1}" - local mnt="${2}" - local img_fullname="${img##*/}" - local sfs_dev - - if [[ "${copytoram}" == "y" ]]; then - msg -n ":: Copying squashfs image to RAM..." - if ! cp "${img}" "/run/parabolaiso/copytoram/${img_fullname}" ; then - echo "ERROR: while copy '${img}' to '/run/parabolaiso/copytoram/${img_fullname}'" - launch_interactive_shell - fi - img="/run/parabolaiso/copytoram/${img_fullname}" - msg "done." - fi - sfs_dev=$(losetup --find --show --read-only "${img}") - echo ${sfs_dev} >> /run/parabolaiso/used_block_devices - _mnt_dev "${sfs_dev}" "${mnt}" "-r" -} - -# args: device, mountpoint, flags -_mnt_dev() { - local dev="${1}" - local mnt="${2}" - local flg="${3}" - - mkdir -p "${mnt}" - - msg ":: Mounting '${dev}' to '${mnt}'" - - while ! poll_device "${dev}" 30; do - echo "ERROR: '${dev}' device did not show up after 30 seconds..." - echo " Falling back to interactive prompt" - echo " You can try to fix the problem manually, log out when you are finished" - launch_interactive_shell - done - - if mount "${flg}" "${dev}" "${mnt}"; then - msg ":: Device '${dev}' mounted successfully." - else - echo "ERROR; Failed to mount '${dev}'" - 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 -} - -_verify_checksum() { - local _status - cd "/run/parabolaiso/bootmnt/${parabolaisobasedir}" - md5sum -c checksum.${arch}.md5 > /tmp/checksum.${arch}.log 2>&1 - _status=$? - cd "${OLDPWD}" - return ${_status} -} - -run_hook() { - [[ -z "${arch}" ]] && arch="$(uname -m)" - [[ -z "${cowspace_size}" ]] && cowspace_size="75%" - [[ -z "${copytoram_size}" ]] && copytoram_size="75%" - [[ -z "${parabolaisobasedir}" ]] && parabolaisobasedir="parabola" - [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="parabola" - [[ -z "${parabolaisodevice}" ]] && parabolaisodevice="/dev/disk/by-label/${parabolaisolabel}" - if [[ -z "${cowfile_size}" ]]; then - cowfile_size="100" - else - cowfile_size=${cowfile_size/%} - fi - - if [[ -z "${aitab}" ]]; then - aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/aitab" - else - aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab}" - fi - - 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" - else - cow_persistent="N" - fi - - [[ -z "${cow_directory}" ]] && cow_directory="persistent_${parabolaisolabel}/${arch}" - - # set mount handler for parabolaiso - mount_handler="parabolaiso_mount_handler" -} - -# This function is called normally from init script, but it can be called -# as chain from other mount handlers. -# args: /path/to/newroot -parabolaiso_mount_handler() { - local newroot="${1}" - - if ! mountpoint -q "/run/parabolaiso/bootmnt"; then - _mnt_dev "${parabolaisodevice}" "/run/parabolaiso/bootmnt" "-r" - if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${parabolaisodevice}) >> /run/parabolaiso/used_block_devices - fi - fi - - - if [[ ! -f "${aitab}" ]]; then - echo "ERROR: '${aitab}' file does not exist." - 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 [[ "${checksum}" == "y" ]]; then - if [[ -f "/run/parabolaiso/bootmnt/${parabolaisobasedir}/checksum.${arch}.md5" ]]; then - msg -n ":: Self-test requested, please wait..." - if _verify_checksum; then - msg "done. Checksum is OK, continue booting." - else - echo "ERROR: one or more files are corrupted" - echo "see /tmp/checksum.${arch}.log for details" - launch_interactive_shell - fi - else - echo "ERROR: checksum=y option specified but checksum.${arch}.md5 not found" - launch_interactive_shell - fi - fi - - if [[ "${copytoram}" == "y" ]]; then - msg ":: Mounting /run/parabolaiso/copytoram (tmpfs) filesystem, size=${copytoram_size}" - mkdir -p /run/parabolaiso/copytoram - mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/parabolaiso/copytoram - fi - - if [[ -n "${cow_device}" ]]; then - _mnt_dev "${cow_device}" "/run/parabolaiso/cowspace" "-r" - echo $(readlink -f ${cow_device}) >> /run/parabolaiso/used_block_devices - mount -o remount,rw "/run/parabolaiso/cowspace" - else - msg ":: Mounting /run/parabolaiso/cowspace (tmpfs) filesystem, size=${cowspace_size}..." - mkdir -p /run/parabolaiso/cowspace - mount -t tmpfs -o "size=${cowspace_size}",mode=0755 cowspace /run/parabolaiso/cowspace - fi - mkdir -p "/run/parabolaiso/cowspace/${cow_directory}" - - local aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size - while read aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size; do - [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue - [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue - if [[ "${aitab_fs_type}" != "none" ]]; then - _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/run/parabolaiso/sfs/${aitab_img}" - _mnt_fs "/run/parabolaiso/sfs/${aitab_img}/${aitab_img}.fs" "${newroot}" "${aitab_mnt}" - else - _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "${newroot}${aitab_mnt}" - fi - done < "${aitab}" - - if [[ "${copytoram}" == "y" ]]; then - umount /run/parabolaiso/bootmnt - fi -} - -# vim:ft=sh:ts=4:sw=4:et: diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt deleted file mode 100644 index 772c3b6..0000000 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ /dev/null @@ -1,32 +0,0 @@ -# vim: set ft=sh: - -run_hook () { - [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}" - if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then - mount_handler="parabolaiso_loop_mount_handler" - fi -} - -parabolaiso_loop_mount_handler () { - newroot="${1}" - - local _dev_loop - - msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" - _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r" - if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${img_dev}) >> /run/parabolaiso/used_block_devices - fi - - if ! _dev_loop=$(losetup --find --show --read-only "/run/parabolaiso/img_dev/${img_loop}"); then - echo "ERROR: Setting loopback device for file '/run/parabolaiso/img_dev/${img_loop}'" - launch_interactive_shell - fi - - parabolaiso_mount_handler ${newroot} - - if [[ "${copytoram}" == "y" ]]; then - losetup -d ${_dev_loop} - umount /run/parabolaiso/img_dev - fi -} diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common deleted file mode 100644 index d8ac709..0000000 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ /dev/null @@ -1,50 +0,0 @@ -# vim: set ft=sh: - -run_hook () { - local i net_mac bootif_mac bootif_dev - # 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 - - if [[ -n "${ip}" ]]; then - if [[ -n "${BOOTIF}" ]]; then - bootif_mac=${BOOTIF#01-} - bootif_mac=${bootif_mac//-/:} - for i in /sys/class/net/*/address; do - read net_mac < ${i} - if [[ "${bootif_mac}" == "${net_mac}" ]]; then - bootif_dev=${i#/sys/class/net/} - bootif_dev=${bootif_dev%/address} - break - fi - done - ip="${ip}::${bootif_dev}" - fi - - # setup network and save some values - ipconfig "ip=${ip}" - - . /tmp/net-*.conf - - pxeserver=${ROOTSERVER} - - # setup DNS resolver - if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then - echo "nameserver ${IPV4DNS0}" > /etc/resolv.conf - fi - if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then - echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf - fi - fi -} - -run_latehook () { - [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y" - - if [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then - cp /etc/resolv.conf /new_root/etc/resolv.conf - fi -} diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http deleted file mode 100644 index 97de91f..0000000 --- a/archiso/initcpio/hooks/archiso_pxe_http +++ /dev/null @@ -1,61 +0,0 @@ -# vim: set ft=sh: - -run_hook() { - if [[ -n "${ip}" && -n "${parabolaiso_http_srv}" ]]; then - - parabolaiso_http_srv=$(eval echo ${parabolaiso_http_srv}) - [[ -z "${parabolaiso_http_spc}" ]] && parabolaiso_http_spc="75%" - - mount_handler="parabolaiso_pxe_http_mount_handler" - fi -} - -# Fetch a file with CURL -# -# $1 URL -# $2 Destination directory inside httpspace/${parabolaisobasedir} -_curl_get() { - local _url="${1}" - local _dst="${2}" - - msg ":: Downloading '${_url}'" - if ! curl -L -f -o "/run/parabolaiso/httpspace/${parabolaisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then - echo "ERROR: Downloading '${_url}'" - 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 -} - -parabolaiso_pxe_http_mount_handler () { - newroot="${1}" - - msg ":: Mounting /run/parabolaiso/httpspace (tmpfs) filesystem, size='${parabolaiso_http_spc}'" - mkdir -p "/run/parabolaiso/httpspace" - mount -t tmpfs -o size="${parabolaiso_http_spc}",mode=0755 httpspace "/run/parabolaiso/httpspace" - - local _aitab_url="${parabolaiso_http_srv}${aitab#/run/parabolaiso/bootmnt/}" - local _aitab_file="/run/parabolaiso/httpspace/${aitab#/run/parabolaiso/bootmnt/}" - - _curl_get "${_aitab_url}" "/" - - local aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size - while read aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size; do - [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue - [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue - if [[ "${aitab_fs_type}" != "none" ]]; then - _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}" - else - _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}" - fi - done < "${_aitab_file}" - - if [[ "${checksum}" == "y" ]]; then - _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/checksum.${arch}.md5" "/" - fi - - mkdir -p "/run/parabolaiso/bootmnt" - mount -o bind /run/parabolaiso/httpspace /run/parabolaiso/bootmnt - - parabolaiso_mount_handler ${newroot} -} diff --git a/archiso/initcpio/hooks/archiso_pxe_nbd b/archiso/initcpio/hooks/archiso_pxe_nbd deleted file mode 100644 index 1bb8cbb..0000000 --- a/archiso/initcpio/hooks/archiso_pxe_nbd +++ /dev/null @@ -1,40 +0,0 @@ -# vim: set ft=sh: - -run_hook() { - if [[ -n "${ip}" && -n "${parabolaiso_nbd_srv}" ]]; then - - parabolaiso_nbd_srv=$(eval echo ${parabolaiso_nbd_srv}) - [[ -z "${parabolaiso_nbd_name}" ]] && parabolaiso_nbd_name="parabolaiso" - - mount_handler="parabolaiso_pxe_nbd_mount_handler" - fi -} - -parabolaiso_pxe_nbd_mount_handler () { - newroot="${1}" - - # Module autoloading like with loop devices does not work, doing manually... - modprobe nbd 2> /dev/null - - msg ":: Waiting for boot device..." - while ! poll_device /dev/nbd0 30; do - echo "ERROR: boot device didn't show up after 30 seconds..." - echo " Falling back to interactive prompt" - echo " You can try to fix the problem manually, log out when you are finished" - launch_interactive_shell - done - - msg ":: Setup NBD from ${parabolaiso_nbd_srv} at /dev/nbd0" - nbd-client ${parabolaiso_nbd_srv} -N ${parabolaiso_nbd_name} /dev/nbd0 - - if [[ "${copytoram}" != "n" ]]; then - copytoram="y" - fi - - parabolaisodevice=/dev/nbd0 - - parabolaiso_mount_handler ${newroot} - - msg ":: Disconnect NBD from ${parabolaiso_nbd_srv} at /dev/nbd0" - nbd-client -d /dev/nbd0 -} diff --git a/archiso/initcpio/hooks/archiso_pxe_nfs b/archiso/initcpio/hooks/archiso_pxe_nfs deleted file mode 100644 index 6eba5b7..0000000 --- a/archiso/initcpio/hooks/archiso_pxe_nfs +++ /dev/null @@ -1,30 +0,0 @@ -# vim: set ft=sh: - -run_hook() { - if [[ -n "${ip}" && -n "${parabolaiso_nfs_srv}" ]]; then - - parabolaiso_nfs_srv=$(eval echo ${parabolaiso_nfs_srv}) - [[ -n "${parabolaiso_nfs_opt}" ]] && parabolaiso_nfs_opt="-o ${parabolaiso_nfs_opt}" - - mount_handler="parabolaiso_nfs_mount_handler" - fi -} - -parabolaiso_nfs_mount_handler() { - newroot="${1}" - mkdir -p "/run/parabolaiso/bootmnt" - msg ":: Mounting '${parabolaiso_nfs_srv}'" - # Do not put "${parabolaiso_nfs_opt}" nfsmount fails! - if ! nfsmount ${parabolaiso_nfs_opt} "${parabolaiso_nfs_srv}" "/run/parabolaiso/bootmnt"; then - echo "ERROR: Mounting '${parabolaiso_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 - copytoram="y" - fi - - parabolaiso_mount_handler ${newroot} -} diff --git a/archiso/initcpio/hooks/archiso_shutdown b/archiso/initcpio/hooks/archiso_shutdown deleted file mode 100644 index e50dedb..0000000 --- a/archiso/initcpio/hooks/archiso_shutdown +++ /dev/null @@ -1,6 +0,0 @@ -run_cleanuphook() { - rm -rf /usr/lib/modules - cp -ax / /run/initramfs -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso b/archiso/initcpio/install/archiso deleted file mode 100644 index 8893667..0000000 --- a/archiso/initcpio/install/archiso +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -build() { - add_module "cdrom" - add_module "loop" - add_module "dm-snapshot" - - add_runscript - - add_binary /usr/lib/udev/cdrom_id - add_binary blockdev - add_binary dmsetup - add_binary losetup - add_binary mountpoint - - add_file /usr/lib/udev/rules.d/60-cdrom_id.rules - add_file /usr/lib/udev/rules.d/10-dm.rules - add_file /usr/lib/udev/rules.d/95-dm-notify.rules - add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/initcpio/install/archiso_kms b/archiso/initcpio/install/archiso_kms deleted file mode 100644 index 3ff31f3..0000000 --- a/archiso/initcpio/install/archiso_kms +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -build() { - add_module "radeon" - add_module "nouveau" - add_module "i915" - add_module "via-agp" - add_module "sis-agp" - add_module "intel-agp" - - if [[ $(uname -m) == i686 ]]; then - add_module "amd64-agp" - add_module "ati-agp" - add_module "sworks-agp" - add_module "ali-agp" - add_module "amd-k7-agp" - add_module "nvidia-agp" - add_module "efficeon-agp" - fi -} - -help() { - cat << HELPEOF -Adds all common KMS drivers to the initramfs image. -HELPEOF -} diff --git a/archiso/initcpio/install/archiso_loop_mnt b/archiso/initcpio/install/archiso_loop_mnt deleted file mode 100644 index 59f1d94..0000000 --- a/archiso/initcpio/install/archiso_loop_mnt +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -build() { - add_runscript -} - -help() { -cat< $BUILDROOT/etc/nsswitch.conf -} - -help() { -cat< /dev/null; then - umount -d ${_lup} - fi -done - -# Unmount the space used to store *.cow. -umount /oldrun/parabolaiso/cowspace - -# Unmount boot device if needed (no copytoram=y used) -if [[ ! -d /oldrun/parabolaiso/copytoram ]]; then - if [[ -d /oldrun/parabolaiso/img_dev ]]; then - umount /oldrun/parabolaiso/img_dev - else - umount /oldrun/parabolaiso/bootmnt - fi -fi - -# reboot / poweroff / halt, depending on the argument passed by init -# if something invalid is passed, we halt -case "$1" in - reboot|poweroff|halt) "$1" -f ;; - *) halt -f;; -esac diff --git a/archiso/mkarchiso b/archiso/mkarchiso deleted file mode 100755 index e323899..0000000 --- a/archiso/mkarchiso +++ /dev/null @@ -1,584 +0,0 @@ -#!/bin/bash - -set -e -u - -export LANG=C - -app_name=${0##*/} -arch=$(uname -m) -pkg_list="" -run_cmd="" -quiet="y" -pacman_conf="/etc/pacman.conf" -export iso_label="PARABOLA_$(date +%Y%m)" -iso_publisher="Parabola GNU/Linux-libre " -iso_application="Parabola GNU/Linux-libre Live/Rescue CD" -install_dir="parabola" -work_dir="work" -out_dir="out" - -# Show an INFO message -# $1: message string -_msg_info() { - local _msg="${1}" - echo "[mkparabolaiso] INFO: ${_msg}" -} - -# Show an ERROR message then exit with status -# $1: message string -# $2: exit code number (with 0 does not exit) -_msg_error() { - local _msg="${1}" - local _error=${2} - echo - echo "[mkparabolaiso] ERROR: ${_msg}" - echo - if [[ ${_error} -gt 0 ]]; then - exit ${_error} - fi -} - -# Show space usage similar to df, but better formatted. -# $1: mount-point or mounted device. -_show_space_usage () { - local _where="${1}" - local _fs _total _used _avail _pct_u=0 _mnt - read _fs _total _used _avail _pct_u _mnt < <(df -m "${_where}" | tail -1) &> /dev/null - _msg_info "Total: ${_total} MiB (100%) | Used: ${_used} MiB (${_pct_u}) | Avail: ${_avail} MiB ($((100 - ${_pct_u%\%}))%)" -} - -_chroot_mount () { - mount -t devtmpfs dev "${work_dir}/root-image/dev" - mount -t devpts devpts "${work_dir}/root-image/dev/pts" - mount -t tmpfs devshm "${work_dir}/root-image/dev/shm" - mount -t proc proc "${work_dir}/root-image/proc" - mount -t tmpfs run "${work_dir}/root-image/run" - mount -t sysfs sys "${work_dir}/root-image/sys" - mount -t tmpfs tmp "${work_dir}/root-image/tmp" - - trap '_chroot_umount' EXIT HUP INT TERM -} - -_chroot_umount () { - umount "${work_dir}/root-image/tmp" - umount "${work_dir}/root-image/sys" - umount "${work_dir}/root-image/run" - umount "${work_dir}/root-image/proc" - umount "${work_dir}/root-image/dev/shm" - umount "${work_dir}/root-image/dev/pts" - umount "${work_dir}/root-image/dev" - - trap - EXIT HUP INT TERM -} - -_chroot_init() { - if [[ ! -d ${work_dir}/root-image/var/cache/pacman ]]; then - mkdir -p ${work_dir}/root-image/{dev,proc,run,sys,tmp,var/lib/pacman} - _pacman "base" - _pacman "syslinux" - fi -} - -_chroot_run() { - _chroot_mount - eval chroot ${work_dir}/root-image "${run_cmd}" - _chroot_umount -} - -# Mount a filesystem (trap signals in case of error for unmounting it -# $1: source image -# $2: mount-point -_mount_fs() { - local _src="${1}" - local _dst="${2}" - trap "_umount_fs ${_src}" EXIT HUP INT TERM - mkdir -p "${_dst}" - _msg_info "Mounting '${_src}' on '${_dst}'" - mount "${_src}" "${_dst}" - _show_space_usage "${_dst}" -} - -# Unmount a filesystem (and untrap signals) -# $1: mount-point or device/image -_umount_fs() { - local _dst="${1}" - _show_space_usage "${_dst}" - _msg_info "Unmounting '${_dst}'" - umount "${_dst}" - rmdir "${_dst}" - trap - EXIT HUP INT TERM -} - -# Compare if a file/directory (source) is newer than other file (target) -# $1: source file/directory -# $2: target file -# return: 0 if target does not exists or if target is older than source. -# 1 if target is newer than source -_is_directory_changed() { - local _src="${1}" - local _dst="${2}" - - if [ -e "${_dst}" ]; then - if [[ $(find ${_src} -newer ${_dst} | wc -l) -gt 0 ]]; then - _msg_info "Target '${_dst}' is older than '${_src}', updating." - rm -f "${_dst}" - return 0 - else - _msg_info "Target '${_dst}' is up to date with '${_src}', skipping." - return 1 - fi - else - _msg_info "Target '${_dst}' does not exist, making it from '${_src}'" - return 0 - fi -} - -# Show help usage, with an exit status. -# $1: exit status number. -_usage () -{ - echo "usage ${app_name} [options] command " - echo " general options:" - echo " -p PACKAGE(S) Package(s) to install, can be used multiple times" - echo " -r Run inside root-image" - echo " -C Config file for pacman." - echo " Default: '${pacman_conf}'" - echo " -L