From eed77efd49e7104f776d411e8a20442d129d9db8 Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Wed, 13 Mar 2013 19:25:39 -0300 Subject: Replace: archiso -> parabolaiso --- parabolaiso/initcpio/hooks/parabolaiso | 88 ++++++++++++------------- parabolaiso/initcpio/hooks/parabolaiso_loop_mnt | 16 ++--- parabolaiso/initcpio/hooks/parabolaiso_pxe_http | 36 +++++----- parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd | 20 +++--- parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs | 22 +++---- 5 files changed, 91 insertions(+), 91 deletions(-) (limited to 'parabolaiso/initcpio/hooks') diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso index 66a6273..9c93db9 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso +++ b/parabolaiso/initcpio/hooks/parabolaiso @@ -9,7 +9,7 @@ _mnt_fs() { local ro_dev ro_dev_size rw_dev ro_dev=$(losetup --find --show --read-only "${img}") - echo ${ro_dev} >> /run/archiso/used_block_devices + 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} @@ -19,28 +19,28 @@ _mnt_fs() { fi 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." + 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/archiso/cowspace/${cow_directory}/${img_name}.cow' as persistent." - dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null + 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/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" + 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/archiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent." - dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null + 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/archiso/cowspace/${cow_directory}/${img_name}.cow") - echo ${rw_dev} >> /run/archiso/used_block_devices + 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/archiso/used_block_devices + echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/parabolaiso/used_block_devices } # args: /path/to/image_file, mountpoint @@ -52,15 +52,15 @@ _mnt_sfs() { if [[ "${copytoram}" == "y" ]]; then msg -n ":: Copying squashfs image to RAM..." - if ! cp "${img}" "/run/archiso/copytoram/${img_fullname}" ; then - echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'" + 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/archiso/copytoram/${img_fullname}" + img="/run/parabolaiso/copytoram/${img_fullname}" msg "done." fi sfs_dev=$(losetup --find --show --read-only "${img}") - echo ${sfs_dev} >> /run/archiso/used_block_devices + echo ${sfs_dev} >> /run/parabolaiso/used_block_devices _mnt_dev "${sfs_dev}" "${mnt}" "-r" } @@ -93,7 +93,7 @@ _mnt_dev() { _verify_checksum() { local _status - cd "/run/archiso/bootmnt/${archisobasedir}" + cd "/run/parabolaiso/bootmnt/${parabolaisobasedir}" md5sum -c checksum.${arch}.md5 > /tmp/checksum.${arch}.log 2>&1 _status=$? cd "${OLDPWD}" @@ -104,9 +104,9 @@ run_hook() { [[ -z "${arch}" ]] && arch="$(uname -m)" [[ -z "${cowspace_size}" ]] && cowspace_size="75%" [[ -z "${copytoram_size}" ]] && copytoram_size="75%" - [[ -z "${archisobasedir}" ]] && archisobasedir="arch" + [[ -z "${parabolaisobasedir}" ]] && parabolaisobasedir="arch" [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" - [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}" + [[ -z "${parabolaisodevice}" ]] && parabolaisodevice="/dev/disk/by-label/${parabolaisolabel}" if [[ -z "${cowfile_size}" ]]; then cowfile_size="100" else @@ -114,9 +114,9 @@ run_hook() { fi if [[ -z "${aitab}" ]]; then - aitab="/run/archiso/bootmnt/${archisobasedir}/aitab" + aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/aitab" else - aitab="/run/archiso/bootmnt/${archisobasedir}/${aitab}" + aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab}" fi if [[ -n "${cow_label}" ]]; then @@ -128,22 +128,22 @@ run_hook() { cow_persistent="N" fi - [[ -z "${cow_directory}" ]] && cow_directory="persistent_${archisolabel}/${arch}" + [[ -z "${cow_directory}" ]] && cow_directory="persistent_${parabolaisolabel}/${arch}" - # set mount handler for archiso - mount_handler="archiso_mount_handler" + # 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 -archiso_mount_handler() { +parabolaiso_mount_handler() { local newroot="${1}" - if ! mountpoint -q "/run/archiso/bootmnt"; then - _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" + if ! mountpoint -q "/run/parabolaiso/bootmnt"; then + _mnt_dev "${parabolaisodevice}" "/run/parabolaiso/bootmnt" "-r" if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${archisodevice}) >> /run/archiso/used_block_devices + echo $(readlink -f ${parabolaisodevice}) >> /run/parabolaiso/used_block_devices fi fi @@ -156,7 +156,7 @@ archiso_mount_handler() { fi if [[ "${checksum}" == "y" ]]; then - if [[ -f "/run/archiso/bootmnt/${archisobasedir}/checksum.${arch}.md5" ]]; 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." @@ -172,36 +172,36 @@ archiso_mount_handler() { fi 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 + 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/archiso/cowspace" "-r" - echo $(readlink -f ${cow_device}) >> /run/archiso/used_block_devices - mount -o remount,rw "/run/archiso/cowspace" + _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/archiso/cowspace (tmpfs) filesystem, size=${cowspace_size}..." - mkdir -p /run/archiso/cowspace - mount -t tmpfs -o "size=${cowspace_size}",mode=0755 cowspace /run/archiso/cowspace + 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/archiso/cowspace/${cow_directory}" + 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/archiso/bootmnt/${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/run/archiso/sfs/${aitab_img}" - _mnt_fs "/run/archiso/sfs/${aitab_img}/${aitab_img}.fs" "${newroot}" "${aitab_mnt}" + _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/archiso/bootmnt/${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "${newroot}${aitab_mnt}" + _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "${newroot}${aitab_mnt}" fi done < "${aitab}" if [[ "${copytoram}" == "y" ]]; then - umount /run/archiso/bootmnt + umount /run/parabolaiso/bootmnt fi } diff --git a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt index a02cfac..772c3b6 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt +++ b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt @@ -3,30 +3,30 @@ run_hook () { [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}" if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then - mount_handler="archiso_loop_mount_handler" + mount_handler="parabolaiso_loop_mount_handler" fi } -archiso_loop_mount_handler () { +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/archiso/img_dev" "-r" + _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r" if [[ "${copytoram}" != "y" ]]; then - echo $(readlink -f ${img_dev}) >> /run/archiso/used_block_devices + echo $(readlink -f ${img_dev}) >> /run/parabolaiso/used_block_devices fi - if ! _dev_loop=$(losetup --find --show --read-only "/run/archiso/img_dev/${img_loop}"); then - echo "ERROR: Setting loopback device for file '/run/archiso/img_dev/${img_loop}'" + 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 - archiso_mount_handler ${newroot} + parabolaiso_mount_handler ${newroot} if [[ "${copytoram}" == "y" ]]; then losetup -d ${_dev_loop} - umount /run/archiso/img_dev + umount /run/parabolaiso/img_dev fi } diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_http b/parabolaiso/initcpio/hooks/parabolaiso_pxe_http index 32e8ab0..97de91f 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_http +++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_http @@ -1,25 +1,25 @@ # vim: set ft=sh: run_hook() { - if [[ -n "${ip}" && -n "${archiso_http_srv}" ]]; then + if [[ -n "${ip}" && -n "${parabolaiso_http_srv}" ]]; then - archiso_http_srv=$(eval echo ${archiso_http_srv}) - [[ -z "${archiso_http_spc}" ]] && archiso_http_spc="75%" + parabolaiso_http_srv=$(eval echo ${parabolaiso_http_srv}) + [[ -z "${parabolaiso_http_spc}" ]] && parabolaiso_http_spc="75%" - mount_handler="archiso_pxe_http_mount_handler" + mount_handler="parabolaiso_pxe_http_mount_handler" fi } # Fetch a file with CURL # # $1 URL -# $2 Destination directory inside httpspace/${archisobasedir} +# $2 Destination directory inside httpspace/${parabolaisobasedir} _curl_get() { local _url="${1}" local _dst="${2}" msg ":: Downloading '${_url}'" - if ! curl -L -f -o "/run/archiso/httpspace/${archisobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then + 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" @@ -27,15 +27,15 @@ _curl_get() { fi } -archiso_pxe_http_mount_handler () { +parabolaiso_pxe_http_mount_handler () { newroot="${1}" - msg ":: Mounting /run/archiso/httpspace (tmpfs) filesystem, size='${archiso_http_spc}'" - mkdir -p "/run/archiso/httpspace" - mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace" + 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="${archiso_http_srv}${aitab#/run/archiso/bootmnt/}" - local _aitab_file="/run/archiso/httpspace/${aitab#/run/archiso/bootmnt/}" + local _aitab_url="${parabolaiso_http_srv}${aitab#/run/parabolaiso/bootmnt/}" + local _aitab_file="/run/parabolaiso/httpspace/${aitab#/run/parabolaiso/bootmnt/}" _curl_get "${_aitab_url}" "/" @@ -44,18 +44,18 @@ archiso_pxe_http_mount_handler () { [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue if [[ "${aitab_fs_type}" != "none" ]]; then - _curl_get "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}" + _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}" else - _curl_get "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}" + _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}" fi done < "${_aitab_file}" if [[ "${checksum}" == "y" ]]; then - _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/" + _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/checksum.${arch}.md5" "/" fi - mkdir -p "/run/archiso/bootmnt" - mount -o bind /run/archiso/httpspace /run/archiso/bootmnt + mkdir -p "/run/parabolaiso/bootmnt" + mount -o bind /run/parabolaiso/httpspace /run/parabolaiso/bootmnt - archiso_mount_handler ${newroot} + parabolaiso_mount_handler ${newroot} } diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd index d9bc6d8..1bb8cbb 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd +++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd @@ -1,16 +1,16 @@ # vim: set ft=sh: run_hook() { - if [[ -n "${ip}" && -n "${archiso_nbd_srv}" ]]; then + if [[ -n "${ip}" && -n "${parabolaiso_nbd_srv}" ]]; then - archiso_nbd_srv=$(eval echo ${archiso_nbd_srv}) - [[ -z "${archiso_nbd_name}" ]] && archiso_nbd_name="archiso" + parabolaiso_nbd_srv=$(eval echo ${parabolaiso_nbd_srv}) + [[ -z "${parabolaiso_nbd_name}" ]] && parabolaiso_nbd_name="parabolaiso" - mount_handler="archiso_pxe_nbd_mount_handler" + mount_handler="parabolaiso_pxe_nbd_mount_handler" fi } -archiso_pxe_nbd_mount_handler () { +parabolaiso_pxe_nbd_mount_handler () { newroot="${1}" # Module autoloading like with loop devices does not work, doing manually... @@ -24,17 +24,17 @@ archiso_pxe_nbd_mount_handler () { launch_interactive_shell done - msg ":: Setup NBD from ${archiso_nbd_srv} at /dev/nbd0" - nbd-client ${archiso_nbd_srv} -N ${archiso_nbd_name} /dev/nbd0 + 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 - archisodevice=/dev/nbd0 + parabolaisodevice=/dev/nbd0 - archiso_mount_handler ${newroot} + parabolaiso_mount_handler ${newroot} - msg ":: Disconnect NBD from ${archiso_nbd_srv} at /dev/nbd0" + msg ":: Disconnect NBD from ${parabolaiso_nbd_srv} at /dev/nbd0" nbd-client -d /dev/nbd0 } diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs index 67874ec..6eba5b7 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs +++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nfs @@ -1,22 +1,22 @@ # vim: set ft=sh: run_hook() { - if [[ -n "${ip}" && -n "${archiso_nfs_srv}" ]]; then + if [[ -n "${ip}" && -n "${parabolaiso_nfs_srv}" ]]; then - archiso_nfs_srv=$(eval echo ${archiso_nfs_srv}) - [[ -n "${archiso_nfs_opt}" ]] && archiso_nfs_opt="-o ${archiso_nfs_opt}" + parabolaiso_nfs_srv=$(eval echo ${parabolaiso_nfs_srv}) + [[ -n "${parabolaiso_nfs_opt}" ]] && parabolaiso_nfs_opt="-o ${parabolaiso_nfs_opt}" - mount_handler="archiso_nfs_mount_handler" + mount_handler="parabolaiso_nfs_mount_handler" fi } -archiso_nfs_mount_handler() { +parabolaiso_nfs_mount_handler() { 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 - echo "ERROR: Mounting '${archiso_nfs_srv}'" + 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 @@ -26,5 +26,5 @@ archiso_nfs_mount_handler() { copytoram="y" fi - archiso_mount_handler ${newroot} + parabolaiso_mount_handler ${newroot} } -- cgit v1.2.2