diff options
36 files changed, 261 insertions, 261 deletions
@@ -1,8 +1,8 @@ V=6 -INSTALL_FILES=$(wildcard archiso/initcpio/install/*) -HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) -SCRIPT_FILES=$(wildcard archiso/initcpio/script/*) +INSTALL_FILES=$(wildcard parabolaiso/initcpio/install/*) +HOOKS_FILES=$(wildcard parabolaiso/initcpio/hooks/*) +SCRIPT_FILES=$(wildcard parabolaiso/initcpio/script/*) INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks @@ -10,7 +10,7 @@ SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio DOC_FILES=$(wildcard docs/*) -DOC_DIR=$(DESTDIR)/usr/share/doc/archiso +DOC_DIR=$(DESTDIR)/usr/share/doc/parabolaiso all: @@ -18,7 +18,7 @@ all: install: install-program install-initcpio install-examples install-doc install-program: - install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/sbin/mkarchiso + install -D -m 755 parabolaiso/mkparabolaiso $(DESTDIR)/usr/sbin/mkparabolaiso install-initcpio: install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR) @@ -27,15 +27,15 @@ install-initcpio: install -m 644 -t $(INSTALL_DIR) $(INSTALL_FILES) install-examples: - install -d -m 755 $(DESTDIR)/usr/share/archiso/ - cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/archiso/ + install -d -m 755 $(DESTDIR)/usr/share/parabolaiso/ + cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/parabolaiso/ install-doc: install -d $(DOC_DIR) 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=parabolaiso-$(V)/ v$(V) | gzip -9 > parabolaiso-$(V).tar.gz + gpg --detach-sign --use-agent parabolaiso-$(V).tar.gz .PHONY: install install-program install-initcpio install-examples install-doc dist diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 8a75e7a..faef37d 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -22,21 +22,21 @@ run_once() { # Base installation (root-image) make_basefs() { - mkarchiso -v -w "${work_dir}" -D "${install_dir}" init + mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" init } -# Copy mkinitcpio archiso hooks and build initramfs (root-image) +# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) make_setup_mkinitcpio() { - cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks - cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install - cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/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 + cp /usr/lib/initcpio/hooks/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/hooks + cp /usr/lib/initcpio/install/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/install + cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-parabolaiso.conf + mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux -g /boot/parabolaiso.img' run } # Prepare ${install_dir}/boot/ make_boot() { mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} - cp ${work_dir}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img + cp ${work_dir}/root-image/boot/parabolaiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz } @@ -64,13 +64,13 @@ make_aitab() { # Build all filesystem images specified in aitab (.fs.sfs .sfs) make_prepare() { - mkarchiso -v -w "${work_dir}" -D "${install_dir}" prepare + mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" prepare } # Build ISO make_iso() { - mkarchiso -v -w "${work_dir}" -D "${install_dir}" checksum - mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso" + mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" checksum + mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso" } run_once make_basefs diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf index 1b3d35f..8cf3926 100644 --- a/configs/baseline/mkinitcpio.conf +++ b/configs/baseline/mkinitcpio.conf @@ -1 +1 @@ -HOOKS="base udev archiso block filesystems" +HOOKS="base udev parabolaiso block filesystems" diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index e504bec..6ddccc0 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -4,5 +4,5 @@ MENU TITLE Parabola GNU/Linux-libre LABEL arch MENU LABEL Parabola GNU/Linux-libre LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +INITRD boot/%ARCH%/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index b185654..45ee5cc 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -53,26 +53,26 @@ make_pacman_conf() { # Base installation, plus needed packages (root-image) make_basefs() { - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install } # Additional packages (root-image) make_packages() { - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install } -# Copy mkinitcpio archiso hooks and build initramfs (root-image) +# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) make_setup_mkinitcpio() { local _hook - for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do + for _hook in parabolaiso parabolaiso_shutdown parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_loop_mnt; do cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install done - cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install - cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio - cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-archiso.conf - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + cp /usr/lib/initcpio/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install + cp /usr/lib/initcpio/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio + cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux -g /boot/parabolaiso.img' run } # Customize installation (root-image) @@ -84,14 +84,14 @@ make_customize_root_image() { lynx -dump -nolist 'https://wiki.parabolagnulinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh } # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} - cp ${work_dir}/${arch}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img + cp ${work_dir}/${arch}/root-image/boot/parabolaiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img cp ${work_dir}/${arch}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz } @@ -138,7 +138,7 @@ make_efi() { 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/parabolaiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/parabolaiso-x86_64.conf # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi @@ -148,16 +148,16 @@ make_efi() { # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode make_efiboot() { - mkdir -p ${work_dir}/iso/EFI/archiso - truncate -s 31M ${work_dir}/iso/EFI/archiso/efiboot.img - mkfs.vfat -n ARCHISO_EFI ${work_dir}/iso/EFI/archiso/efiboot.img + mkdir -p ${work_dir}/iso/EFI/parabolaiso + truncate -s 31M ${work_dir}/iso/EFI/parabolaiso/efiboot.img + mkfs.vfat -n ARCHISO_EFI ${work_dir}/iso/EFI/parabolaiso/efiboot.img mkdir -p ${work_dir}/efiboot - mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot + mount ${work_dir}/iso/EFI/parabolaiso/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/parabolaiso + cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi + cp ${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img mkdir -p ${work_dir}/efiboot/EFI/boot cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi @@ -169,7 +169,7 @@ make_efiboot() { 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/parabolaiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/parabolaiso-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/ @@ -186,16 +186,16 @@ make_aitab() { # Build all filesystem images specified in aitab (.fs.sfs .sfs) make_prepare() { cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir} - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist - setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist + setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare rm -rf ${work_dir}/root-image # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps) } # Build ISO make_iso() { - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum - mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" } if [[ ${EUID} -ne 0 ]]; then diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf index 4093308..fba03d5 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf @@ -1,4 +1,4 @@ -title Parabola GNU/Linux-libre archiso x86_64 UEFI CD -linux /EFI/archiso/vmlinuz.efi -initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD +linux /EFI/parabolaiso/vmlinuz.efi +initrd /EFI/parabolaiso/parabolaiso.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf index c5e1ce6..6b87475 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf @@ -1,4 +1,4 @@ -title Parabola GNU/Linux-libre archiso x86_64 UEFI USB +title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB linux /%INSTALL_DIR%/boot/x86_64/vmlinuz -initrd /%INSTALL_DIR%/boot/x86_64/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 62c4a83..ba02c50 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 parabolaiso-x86_64 diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg index 1040d3f..3ee24e0 100644 --- a/configs/releng/isolinux/isolinux.cfg +++ b/configs/releng/isolinux/isolinux.cfg @@ -1,5 +1,5 @@ DEFAULT loadconfig LABEL loadconfig - CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg + CONFIG /%INSTALL_DIR%/boot/syslinux/parabolaiso.cfg APPEND /%INSTALL_DIR%/ diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index f676106..f980765 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS="base udev timestamp memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard" +HOOKS="base udev timestamp memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard" COMPRESSION="xz" diff --git a/configs/releng/root-image/etc/hostname b/configs/releng/root-image/etc/hostname index 2dbe21e..8aaf41b 100644 --- a/configs/releng/root-image/etc/hostname +++ b/configs/releng/root-image/etc/hostname @@ -1 +1 @@ -archiso +parabolaiso diff --git a/configs/releng/syslinux/parabolaiso.cfg b/configs/releng/syslinux/parabolaiso.cfg index d1817af..473e245 100644 --- a/configs/releng/syslinux/parabolaiso.cfg +++ b/configs/releng/syslinux/parabolaiso.cfg @@ -5,7 +5,7 @@ COM32 boot/syslinux/whichsys.c32 APPEND -pxe- pxe -sys- sys -iso- sys LABEL pxe -CONFIG boot/syslinux/archiso_pxe_choose.cfg +CONFIG boot/syslinux/parabolaiso_pxe_choose.cfg LABEL sys -CONFIG boot/syslinux/archiso_sys_choose.cfg +CONFIG boot/syslinux/parabolaiso_sys_choose.cfg diff --git a/configs/releng/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32.cfg index e3d9920..b3ec7cc 100644 --- a/configs/releng/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe32.cfg @@ -5,8 +5,8 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} +INITRD boot/i686/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% parabolaiso_nbd_srv=${pxeserver} IPAPPEND 3 LABEL arch32_nfs @@ -16,8 +16,8 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt +INITRD boot/i686/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt IPAPPEND 3 LABEL arch32_http @@ -27,6 +27,6 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ +INITRD boot/i686/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ IPAPPEND 3 diff --git a/configs/releng/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64.cfg index 2c79ab1..64d801f 100644 --- a/configs/releng/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe64.cfg @@ -5,8 +5,8 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} +INITRD boot/x86_64/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% parabolaiso_nbd_srv=${pxeserver} IPAPPEND 3 LABEL arch64_nfs @@ -16,8 +16,8 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt +INITRD boot/x86_64/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt IPAPPEND 3 LABEL arch64_http @@ -27,6 +27,6 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ +INITRD boot/x86_64/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ IPAPPEND 3 diff --git a/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg b/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg index e4115df..ba514cb 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg @@ -1,3 +1,3 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg +INCLUDE boot/syslinux/parabolaiso_head.cfg +INCLUDE boot/syslinux/parabolaiso_pxe32.cfg +INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg index 1593303..9396d9b 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg @@ -1,4 +1,4 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_pxe64.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg +INCLUDE boot/syslinux/parabolaiso_head.cfg +INCLUDE boot/syslinux/parabolaiso_pxe64.cfg +INCLUDE boot/syslinux/parabolaiso_pxe32.cfg +INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_pxe_choose.cfg b/configs/releng/syslinux/parabolaiso_pxe_choose.cfg index 6296065..a3a768f 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_choose.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_choose.cfg @@ -5,7 +5,7 @@ COM32 boot/syslinux/ifcpu64.c32 APPEND have64 -- nohave64 LABEL have64 -CONFIG boot/syslinux/archiso_pxe_both_inc.cfg +CONFIG boot/syslinux/parabolaiso_pxe_both_inc.cfg LABEL nohave64 -CONFIG boot/syslinux/archiso_pxe_32_inc.cfg +CONFIG boot/syslinux/parabolaiso_pxe_32_inc.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg index dac0f6f..a104149 100644 --- a/configs/releng/syslinux/parabolaiso_sys32.cfg +++ b/configs/releng/syslinux/parabolaiso_sys32.cfg @@ -5,5 +5,5 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +INITRD boot/i686/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys64.cfg b/configs/releng/syslinux/parabolaiso_sys64.cfg index 6ebdf82..f3df01e 100644 --- a/configs/releng/syslinux/parabolaiso_sys64.cfg +++ b/configs/releng/syslinux/parabolaiso_sys64.cfg @@ -5,5 +5,5 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +INITRD boot/x86_64/parabolaiso.img +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg index 9e37093..c641201 100644 --- a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg @@ -1,3 +1,3 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_sys32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg +INCLUDE boot/syslinux/parabolaiso_head.cfg +INCLUDE boot/syslinux/parabolaiso_sys32.cfg +INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg index e885c40..9dfb87f 100644 --- a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg @@ -1,4 +1,4 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_sys64.cfg -INCLUDE boot/syslinux/archiso_sys32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg +INCLUDE boot/syslinux/parabolaiso_head.cfg +INCLUDE boot/syslinux/parabolaiso_sys64.cfg +INCLUDE boot/syslinux/parabolaiso_sys32.cfg +INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys_choose.cfg b/configs/releng/syslinux/parabolaiso_sys_choose.cfg index 24c597a..d436062 100644 --- a/configs/releng/syslinux/parabolaiso_sys_choose.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_choose.cfg @@ -5,7 +5,7 @@ COM32 boot/syslinux/ifcpu64.c32 APPEND have64 -- nohave64 LABEL have64 -CONFIG boot/syslinux/archiso_sys_both_inc.cfg +CONFIG boot/syslinux/parabolaiso_sys_both_inc.cfg LABEL nohave64 -CONFIG boot/syslinux/archiso_sys_32_inc.cfg +CONFIG boot/syslinux/parabolaiso_sys_32_inc.cfg diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg index 3ee98de..0869ed2 100644 --- a/configs/releng/syslinux/syslinux.cfg +++ b/configs/releng/syslinux/syslinux.cfg @@ -1,5 +1,5 @@ DEFAULT loadconfig LABEL loadconfig - CONFIG archiso.cfg + CONFIG parabolaiso.cfg APPEND ../../ diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods index 1084d66..4d6304d 100644 --- a/docs/README.altbootmethods +++ b/docs/README.altbootmethods @@ -31,15 +31,15 @@ Note: Described method is for using with GRUB2. menuentry "Parabola GNU/Linux-libre (x86_64)" { set isofile="/<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-dual.iso" loopback loop (hd<D>,<P>)$isofile - linux (loop)/arch/boot/x86_64/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile - initrd (loop)/arch/boot/x86_64/archiso.img + linux (loop)/arch/boot/x86_64/vmlinuz parabolaisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile + initrd (loop)/arch/boot/x86_64/parabolaiso.img } menuentry "Parabola GNU/Linux-libre (i686)" { set isofile="/<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-dual.iso" loopback loop (hd<D>,<P>)$isofile - linux (loop)/arch/boot/i686/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile - initrd (loop)/arch/boot/i686/archiso.img + linux (loop)/arch/boot/i686/vmlinuz parabolaisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile + initrd (loop)/arch/boot/i686/parabolaiso.img } @@ -79,10 +79,10 @@ Note: All NIC firmwares should support this. # dnsmasq --port=0 \ --enable-tftp \ - --tftp-root=/run/archiso/bootmnt \ + --tftp-root=/run/parabolaiso/bootmnt \ --dhcp-range=192.168.0.2,192.168.0.254,86400 \ --dhcp-boot=/arch/boot/syslinux/gpxelinux.0 \ - --dhcp-option-force=209,boot/syslinux/archiso.cfg \ + --dhcp-option-force=209,boot/syslinux/parabolaiso.cfg \ --dhcp-option-force=210,/arch/ * DHCP + HTTP @@ -93,7 +93,7 @@ Note: Not all NIC firmware supports HTTP and DNS (if domain name is used). # dnsmasq --port=0 \ --dhcp-range=192.168.0.2,192.168.0.254,86400 \ --dhcp-boot=http://192.168.0.7/arch/boot/syslinux/gpxelinux.0 \ - --dhcp-option-force=209,boot/syslinux/archiso.cfg \ + --dhcp-option-force=209,boot/syslinux/parabolaiso.cfg \ --dhcp-option-force=210,http://192.168.0.7/arch/ @@ -103,12 +103,12 @@ methods can be used to serve the rest of live-medium. * HTTP -# darkhttpd /run/archiso/bootmnt +# darkhttpd /run/parabolaiso/bootmnt * NFS -# echo "/run/archiso/bootmnt 192.168.0.*(ro,no_subtree_check,no_root_squash)" >> /etc/exports +# echo "/run/parabolaiso/bootmnt 192.168.0.*(ro,no_subtree_check,no_root_squash)" >> /etc/exports # systemctl start rpc-mountd.service @@ -118,7 +118,7 @@ Note: Adjust ARCH_201302 as needed. # cat << EOF > /tmp/nbd-server.conf [generic] -[archiso] +[parabolaiso] readonly = true exportname = /dev/disk/by-label/ARCH_201302 EOF diff --git a/docs/README.bootparams b/docs/README.bootparams index 13e1ead..0f19b5b 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -2,27 +2,27 @@ INDEX ----- * Boot parameters (initramfs stage) - * hooks/archiso - * hooks/archiso_pxe_common - * hooks/archiso_pxe_nbd - * hooks/archiso_pxe_http - * hooks/archiso_pxe_nfs - * hooks/archiso_loop_mnt + * hooks/parabolaiso + * hooks/parabolaiso_pxe_common + * hooks/parabolaiso_pxe_nbd + * hooks/parabolaiso_pxe_http + * hooks/parabolaiso_pxe_nfs + * hooks/parabolaiso_loop_mnt *** Boot parameters (initramfs stage) -** hooks/archiso +** hooks/parabolaiso -* archisolabel= Set the filesystem label where archiso files reside. +* parabolaisolabel= Set the filesystem label where parabolaiso files reside. Default: (unset) -* archisodevice= Set the device node where archiso medium is located. - Default: "/dev/disk/by-label/${archisolabel}" -* archisobasedir= Set the base directory where all files reside. +* parabolaisodevice= Set the device node where parabolaiso medium is located. + Default: "/dev/disk/by-label/${parabolaisolabel}" +* parabolaisobasedir= Set the base directory where all files reside. Default: "arch" * aitab= Set the path for "aitab" file. - Default: ${archisobasedir}/aitab + Default: ${parabolaisobasedir}/aitab * copytoram= If set to "y" or just "copytoram" without arguments, all SquashFS are copied to "RAM". Default: (unset) @@ -37,7 +37,7 @@ INDEX must be stored. Default: (unset) or "/dev/disk/by-label/${cow_label}" * cow_directory= Set a directory inside ${cow_device}. - Default: "/persistent_${archisolabel}/${arch}" + Default: "/persistent_${parabolaisolabel}/${arch}" * cow_persistent= Set if snapshots are persistent "P" or non-persistent "N". Default: "N" (if no ${cow_device} is used) otherwise "P". * cowspace_size= Set the size of tmpfs /cowspace. This space is used for @@ -63,7 +63,7 @@ INDEX Default: (architecture of running kernel) -** hooks/archiso_pxe_common +** hooks/parabolaiso_pxe_common * ip= This parameter is setup automatically by PXELINUX when option "IPAPPEND" is set to 1 or 2 in config. @@ -78,31 +78,31 @@ INDEX Default: "y" -** hooks/archiso_pxe_nbd +** hooks/parabolaiso_pxe_nbd -* archiso_nbd_name= Set NBD export name used by the server. - Default: archiso -* archiso_nbd_srv= Set an IP address where NBD reside. +* parabolaiso_nbd_name= Set NBD export name used by the server. + Default: parabolaiso +* parabolaiso_nbd_srv= Set an IP address where NBD reside. If ${pxeserver} is used, PXE IP will be used. Default: (unset) -** hooks/archiso_pxe_http +** hooks/parabolaiso_pxe_http -* archiso_http_srv= Set an HTTP URL (must end with /) where ${archisobasedir} +* parabolaiso_http_srv= Set an HTTP URL (must end with /) where ${parabolaisobasedir} is found with all *.sfs files. In the IP/domain part if ${pxeserver} is used, use PXE IP. Default: (unset) -* archiso_http_spc= Set the size of tmpfs where *.sfs files are downloaded. +* parabolaiso_http_spc= Set the size of tmpfs where *.sfs files are downloaded. Default: "75%" -** hooks/archiso_pxe_nfs +** hooks/parabolaiso_pxe_nfs -* archiso_nfs_srv= Set the NFS-IP:/path of the server +* parabolaiso_nfs_srv= Set the NFS-IP:/path of the server In the IP part if ${pxeserver} is used, PXE IP will be used. Default: (unset) -* archiso_nfs_opt= Set NFS mount options separated by comma. +* parabolaiso_nfs_opt= Set NFS mount options separated by comma. Default: (unset, see below) These are the implicit options: port = as given by server portmap daemon @@ -117,11 +117,11 @@ INDEX flags = hard, nointr, noposix, cto, ac -** hooks/archiso_loop_mnt +** hooks/parabolaiso_loop_mnt -* img_label= Set the filesystem label where archiso-image.iso. +* img_label= Set the filesystem label where parabolaiso-image.iso. Default: (unset) -* img_dev= Device where archiso-image.iso reside. +* img_dev= Device where parabolaiso-image.iso reside. Default: (unset) or "/dev/disk/by-label/${img_label}" -* img_loop= Full path where archiso-image.iso is located on ${img_dev} +* img_loop= Full path where parabolaiso-image.iso is located on ${img_dev} Default: (unset) diff --git a/docs/README.build b/docs/README.build index faf6cca..ba17e94 100644 --- a/docs/README.build +++ b/docs/README.build @@ -2,7 +2,7 @@ INDEX ----- * Build requirements -* Image types generated by mkarchiso. +* Image types generated by mkparabolaiso. * File format for aitab. * Why the /isolinux and /arch/boot/syslinux directories? * Building the most basic Parabola GNU/Linux-libre live media. (configs/baseline) @@ -12,7 +12,7 @@ INDEX *** Build requirements -** For mkarchiso script needs these packages (build host): +** For mkparabolaiso script needs these packages (build host): + squashfs-tools for mksquashfs + libisoburn for xorriso + btrfs-progs for mkfs.btrfs (optional) @@ -23,23 +23,23 @@ INDEX + lynx for fetching the latest installation guide ** For these hooks needs these packages (on target root-image) -* archiso +* parabolaiso + (none) -* archiso_loop_mnt +* parabolaiso_loop_mnt + (none) -* archiso_pxe_common +* parabolaiso_pxe_common + mkinitcpio-nfs-utils for ipconfig -* archiso_pxe_nbd +* parabolaiso_pxe_nbd + nbd for nbd-client -* archiso_pxe_http +* parabolaiso_pxe_http + curl for curl -* archiso_pxe_nfs +* parabolaiso_pxe_nfs + mkinitcpio-nfs-utils for nfsmount -* archiso_shutdown +* parabolaiso_shutdown + (none) -*** Image types generated by mkarchiso. +*** Image types generated by mkparabolaiso. * image-name.sfs SquashFS image with all files directly on it. [read-only, no dm-snapshot is used] @@ -52,7 +52,7 @@ INDEX *** File format for aitab. The aitab file holds information about the filesystems images that must be -created by mkarchiso and mounted at initramfs stage from the archiso hook. +created by mkparabolaiso and mounted at initramfs stage from the parabolaiso hook. It consists of some fields which define the behaviour of images. # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> @@ -88,12 +88,12 @@ When make your custom boot-pendrive, you need to copy /arch directory to it. * Install needed packages. # pacman -S git make squashfs-tools libisoburn rsync --needed -* Install archiso. - # git clone git://projects.parabolagnulinux.org/archiso.git - # make -C archiso install +* Install parabolaiso. + # git clone git://projects.parabolagnulinux.org/parabolaiso.git + # make -C parabolaiso install * Build a basic iso. - # /usr/share/archiso/configs/baseline/build.sh + # /usr/share/parabolaiso/configs/baseline/build.sh Note: If you want to customize, just see the configs/releng directory which is used to build official images with much more things. @@ -104,11 +104,11 @@ used to build official images with much more things. * Install needed packages. # pacman -S git make squashfs-tools libisoburn dosfstools lynx patch --needed -* Install archiso. - # git clone git://projects.parabolagnulinux.org/archiso.git - # make -C archiso install +* Install parabolaiso. + # git clone git://projects.parabolagnulinux.org/parabolaiso.git + # make -C parabolaiso install * Build them! - # /usr/share/archiso/configs/releng/build.sh + # /usr/share/parabolaiso/configs/releng/build.sh Note: See build.sh -h for more options. This only runs on x86_64. diff --git a/docs/README.knownissues b/docs/README.knownissues index 2f9cf70..1ff23e1 100644 --- a/docs/README.knownissues +++ b/docs/README.knownissues @@ -2,11 +2,11 @@ ** (1) On shutdown lots of messages from systemd like: - "Could not unmount /run/archiso/<ABC>: Device or resource busy" + "Could not unmount /run/parabolaiso/<ABC>: Device or resource busy" "Could not delete loopback /dev/loop<N>: Device or resource busy" This is not a real issue since, all mounted filesystem, loopback devices - and device mapper devices made by archiso will be "free" on "shutdown tmpfs" - (A.K.A deinitramfs), build at initramfs by [archiso_shutdown] initcpio hook. + and device mapper devices made by parabolaiso will be "free" on "shutdown tmpfs" + (A.K.A deinitramfs), build at initramfs by [parabolaiso_shutdown] initcpio hook. Proper shutdown is mostly important when persistent is used. ** (2) ISOHYBRID-MBR does boot on some hardware: diff --git a/docs/README.transfer b/docs/README.transfer index f829e0c..37dfa77 100644 --- a/docs/README.transfer +++ b/docs/README.transfer @@ -43,7 +43,7 @@ Note: These steps are the general workflow, you can skip some of them, using another filesystem if your bootloader supports it, installing to another directory than "arch/" or using more than one partition. Just ensure that main boot params options - (archisolabel= and archisobasedir=) are set correctly according to your setup. + (parabolaisolabel= and parabolaisobasedir=) are set correctly according to your setup. Nomeclature: <DEV-TARGET>: Device node of the drive where ISO contents should be copied @@ -116,7 +116,7 @@ Note: Using here a GPT partition mode as example, but MBR should also works # mount <DEV-TARGET-N> <MNT-TARGET-N> 4) Extract ISO image on target filesystem. -# bsdtar -x --exclude=isolinux/ --exclude=EFI/archiso/ --exclude=arch/boot/syslinux/ -f <ISO-SOURCE> -C <MNT-TARGET-N> +# bsdtar -x --exclude=isolinux/ --exclude=EFI/parabolaiso/ --exclude=arch/boot/syslinux/ -f <ISO-SOURCE> -C <MNT-TARGET-N> 5) Unmount target filesystem. # umount <MNT-TARGET-N> 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} } diff --git a/parabolaiso/initcpio/install/parabolaiso_shutdown b/parabolaiso/initcpio/install/parabolaiso_shutdown index 5ae976a..d7bffa7 100644 --- a/parabolaiso/initcpio/install/parabolaiso_shutdown +++ b/parabolaiso/initcpio/install/parabolaiso_shutdown @@ -5,7 +5,7 @@ build() { add_runscript - add_file /usr/lib/initcpio/archiso_shutdown /shutdown + add_file /usr/lib/initcpio/parabolaiso_shutdown /shutdown } help() { diff --git a/parabolaiso/initcpio/script/parabolaiso_shutdown b/parabolaiso/initcpio/script/parabolaiso_shutdown index 41b3945..143df04 100644 --- a/parabolaiso/initcpio/script/parabolaiso_shutdown +++ b/parabolaiso/initcpio/script/parabolaiso_shutdown @@ -1,6 +1,6 @@ #!/bin/ash -# /oldroot depends on things inside /oldroot/run/archiso... +# /oldroot depends on things inside /oldroot/run/parabolaiso... mkdir /oldrun mount -n --move /oldroot/run /oldrun @@ -11,21 +11,21 @@ umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r) dmsetup remove_all # Remove all loopback devices. -for _lup in $(grep ^/dev/loop /oldrun/archiso/used_block_devices | tac); do +for _lup in $(grep ^/dev/loop /oldrun/parabolaiso/used_block_devices | tac); do if ! losetup -d ${_lup} 2> /dev/null; then umount -d ${_lup} fi done # Unmount the space used to store *.cow. -umount /oldrun/archiso/cowspace +umount /oldrun/parabolaiso/cowspace # Unmount boot device if needed (no copytoram=y used) -if [[ ! -d /oldrun/archiso/copytoram ]]; then - if [[ -d /oldrun/archiso/img_dev ]]; then - umount /oldrun/archiso/img_dev +if [[ ! -d /oldrun/parabolaiso/copytoram ]]; then + if [[ -d /oldrun/parabolaiso/img_dev ]]; then + umount /oldrun/parabolaiso/img_dev else - umount /oldrun/archiso/bootmnt + umount /oldrun/parabolaiso/bootmnt fi fi diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 55f20f7..35ea2b0 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -21,7 +21,7 @@ out_dir="out" # $1: message string _msg_info() { local _msg="${1}" - echo "[mkarchiso] INFO: ${_msg}" + echo "[mkparabolaiso] INFO: ${_msg}" } # Show an ERROR message then exit with status @@ -31,7 +31,7 @@ _msg_error() { local _msg="${1}" local _error=${2} echo - echo "[mkarchiso] ERROR: ${_msg}" + echo "[mkparabolaiso] ERROR: ${_msg}" echo if [[ ${_error} -gt 0 ]]; then exit ${_error} @@ -293,7 +293,7 @@ _mksfs () { mksquashfs "${work_dir}/${_src}" "${_sfs_img}" -noappend -comp "${_sfs_comp}" -no-progress fi _seconds=$((SECONDS - _seconds)) - printf "[mkarchiso] INFO: Image creation done in %02d:%02d minutes\n" $((_seconds / 60)) $((_seconds % 60)) + printf "[mkparabolaiso] INFO: Image creation done in %02d:%02d minutes\n" $((_seconds / 60)) $((_seconds % 60)) } # Makes a filesystem from a source directory. @@ -413,8 +413,8 @@ command_iso () { fi # 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="--efi-boot EFI/archiso/efiboot.img" + if [[ -f "${work_dir}/iso/EFI/parabolaiso/efiboot.img" ]]; then + _iso_efi_boot_args="--efi-boot EFI/parabolaiso/efiboot.img" fi _show_config iso @@ -432,7 +432,7 @@ command_iso () { -volid "${iso_label}" \ -appid "${iso_application}" \ -publisher "${iso_publisher}" \ - -preparer "prepared by mkarchiso" \ + -preparer "prepared by mkparabolaiso" \ -eltorito-boot isolinux/isolinux.bin \ -eltorito-catalog isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ |