diff options
29 files changed, 381 insertions, 72 deletions
diff --git a/archiso/archiso_pxe_nbd b/archiso/archiso_pxe_nbd new file mode 100644 index 0000000..e6b9872 --- /dev/null +++ b/archiso/archiso_pxe_nbd @@ -0,0 +1,6 @@ +omit_kill_nbd_client() { + add_omit_pids $(< /run/archiso/nbd_client.pid) +} + +add_hook shutdown_prekillall omit_kill_nbd_client +add_hook single_prekillall omit_kill_nbd_client diff --git a/archiso/archiso_shutdown b/archiso/archiso_shutdown new file mode 100644 index 0000000..85cce59 --- /dev/null +++ b/archiso/archiso_shutdown @@ -0,0 +1,40 @@ +#!/bin/ash + +# /oldroot depends on things inside /oldroot/run/archiso... +mkdir /oldrun +mount -n --move /oldroot/run /oldrun + +# Unmount all mounts now. +umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r) + +# Remove all dm-snapshot devices. +dmsetup remove_all + +# Remove all loopback devices. +for _lup in $(grep ^/dev/loop /oldrun/archiso/used_block_devices | tac); do + if ! losetup -d ${_lup} 2> /dev/null; then + umount -d ${_lup} + fi +done + +# Unmount the space used to store *.cow. +umount /oldrun/archiso/cowspace + +# Unmount boot device if needed (no copytoram=y used) +if [[ ! -d /oldrun/archiso/copytoram ]]; then + if [[ -d /oldrun/archiso/img_dev ]]; then + umount /oldrun/archiso/img_dev + else + umount /oldrun/archiso/bootmnt + fi + if [[ -f /oldrun/archiso/nbd_client.pid ]]; then + nbd-client -d /dev/nbd0 + 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/hooks/archiso_pxe_common b/archiso/hooks/archiso_pxe_common new file mode 100644 index 0000000..febb503 --- /dev/null +++ b/archiso/hooks/archiso_pxe_common @@ -0,0 +1,42 @@ +# 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 +} diff --git a/archiso/hooks/archiso_pxe_http b/archiso/hooks/archiso_pxe_http new file mode 100644 index 0000000..ae56210 --- /dev/null +++ b/archiso/hooks/archiso_pxe_http @@ -0,0 +1,61 @@ +# vim: set ft=sh: + +run_hook() { + if [[ -n "${ip}" && -n "${archiso_http_srv}" ]]; then + + archiso_http_srv=$(eval echo ${archiso_http_srv}) + [[ -z "${archiso_http_spc}" ]] && archiso_http_spc="75%" + + mount_handler="archiso_pxe_http_mount_handler" + fi +} + +# Fetch a file with CURL +# +# $1 URL +# $2 Destination directory inside httpspace/${archisobasedir} +_curl_get() { + local _url="${1}" + local _dst="${2}" + + msg ":: Downloading '${_url}'" + if ! curl -f -o "/run/archiso/httpspace/${archisobasedir}${_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 +} + +archiso_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" + + local _aitab_url="${archiso_http_srv}${aitab#/run/archiso/bootmnt/}" + local _aitab_file="/run/archiso/httpspace/${aitab#/run/archiso/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 "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}" + else + _curl_get "${archiso_http_srv}${archisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}" + fi + done < "${_aitab_file}" + + if [[ "${checksum}" == "y" ]]; then + _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/" + fi + + mkdir -p "/run/archiso/bootmnt" + mount -o bind /run/archiso/httpspace /run/archiso/bootmnt + + archiso_mount_handler ${newroot} +} diff --git a/archiso/hooks/archiso_pxe_nfs b/archiso/hooks/archiso_pxe_nfs new file mode 100644 index 0000000..a053672 --- /dev/null +++ b/archiso/hooks/archiso_pxe_nfs @@ -0,0 +1,26 @@ +# vim: set ft=sh: + +run_hook() { + if [[ -n "${ip}" && -n "${archiso_nfs_srv}" ]]; then + + archiso_nfs_srv=$(eval echo ${archiso_nfs_srv}) + [[ -n "${archiso_nfs_opt}" ]] && archiso_nfs_opt="-o ${archiso_nfs_opt}" + + mount_handler="archiso_nfs_mount_handler" + fi +} + +archiso_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}'" + 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 + + archiso_mount_handler ${newroot} +} diff --git a/archiso/hooks/archiso_shutdown b/archiso/hooks/archiso_shutdown new file mode 100644 index 0000000..24e4103 --- /dev/null +++ b/archiso/hooks/archiso_shutdown @@ -0,0 +1,23 @@ +run_hook () +{ + msg -n ":: Creating shutdown ramfs..." + + for _dir in bin lib sbin usr/bin usr/lib usr/sbin; do + mkdir -p /run/initramfs/${_dir} + done + cp /bin/busybox /run/initramfs/bin/ + cp /lib/ld-* /run/initramfs/lib/ + cp /lib/lib* /run/initramfs/lib/ + cp /usr/lib/lib* /run/initramfs/usr/lib/ + cp /bin/mount /run/initramfs/bin/ + cp /sbin/dmsetup /run/initramfs/sbin/ + cp /sbin/losetup /run/initramfs/sbin/ + if [[ -x /bin/nbd-client ]]; then + cp /bin/nbd-client /run/initramfs/bin/ + fi + + chroot /run/initramfs /bin/busybox --install + cp /shutdown /run/initramfs/ + + msg "done." +} diff --git a/archiso/install/archiso_kms b/archiso/install/archiso_kms new file mode 100644 index 0000000..6566049 --- /dev/null +++ b/archiso/install/archiso_kms @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + MODULES="radeon nouveau i915 via-agp sis-agp intel-agp" + if [[ $(uname -m) == i686 ]]; then + MODULES+=" amd64-agp ati-agp sworks-agp ali-agp amd-k7-agp nvidia-agp efficeon-agp" + fi +} + +help() { + cat << HELPEOF +Adds all common KMS drivers to the initramfs image. +HELPEOF +} diff --git a/archiso/install/archiso_pxe_common b/archiso/install/archiso_pxe_common new file mode 100644 index 0000000..b37e5a1 --- /dev/null +++ b/archiso/install/archiso_pxe_common @@ -0,0 +1,30 @@ +#!/bin/bash + +build() { + MODULES="${MODULES} $(comm -2 -3 <(checked_modules "/drivers/net/" | sort) \ + <(find $MODULEDIR/kernel/drivers/net/{irda,phy,wimax,wireless} \ + -name '*.ko*' \ + -exec bash -c 'printf "%s\n" "${@%%.ko*}" | sed "s@.*/@@;s@-@_@" | sort' _ {} +) \ + | grep -v -e 'ppp_' -e 'plip' -e 'pppoe')" + SCRIPT="archiso_pxe_common" + + + add_binary /lib/initcpio/ipconfig /bin/ipconfig + + # Add hosts support files+dns + add_symlink /lib/libnss_files.so.2 $(readlink /lib/libnss_files.so.2) + add_binary $(readlink -f /lib/libnss_files.so.2) + add_symlink /lib/libnss_dns.so.2 $(readlink /lib/libnss_dns.so.2) + add_binary $(readlink -f /lib/libnss_dns.so.2) + + add_dir /etc + echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf +} + +help() { +cat<<HELPEOF + This hook loads the necessary modules for boot via PXE. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/install/archiso_pxe_http b/archiso/install/archiso_pxe_http new file mode 100644 index 0000000..9e2ff65 --- /dev/null +++ b/archiso/install/archiso_pxe_http @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + SCRIPT="archiso_pxe_http" + + add_binary curl +} + +help() { +cat<<HELPEOF + This hook loads the necessary modules for boot via PXE and HTTP. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/install/archiso_pxe_nfs b/archiso/install/archiso_pxe_nfs new file mode 100644 index 0000000..f7b6f5d --- /dev/null +++ b/archiso/install/archiso_pxe_nfs @@ -0,0 +1,16 @@ +#!/bin/bash + +build() { + MODULES="nfs" + SCRIPT="archiso_pxe_nfs" + + add_binary /lib/initcpio/nfsmount /bin/nfsmount +} + +help() { + cat <<HELPEOF + This hook loads the necessary modules for boot via PXE and NFS. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/install/archiso_shutdown b/archiso/install/archiso_shutdown new file mode 100644 index 0000000..87b8297 --- /dev/null +++ b/archiso/install/archiso_shutdown @@ -0,0 +1,18 @@ +#!/bin/bash + +build() { + SCRIPT="archiso_shutdown" + + add_file /usr/lib/initcpio/archiso_shutdown /shutdown +} + +help() { + cat <<HELPEOF +This hook will create a shutdown initramfs in /run/initramfs +that we can pivot to on shutdown in order to unmount / and +and others mount points, dm-snapshot devices and loopback devices. +Mostly usefull for dm-snapshot persistent. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/archiso/mkarchiso b/archiso/mkarchiso index e3a3346..31abd2c 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -10,10 +10,10 @@ pkg_list="" run_cmd="" quiet="y" pacman_conf="/etc/pacman.conf" -export iso_label="ARCH_$(date +%Y%m)" -iso_publisher="Arch Linux <http://www.archlinux.org>" -iso_application="Arch Linux Live/Rescue CD" -install_dir="arch" +export iso_label="PARABOLA_$(date +%Y%m)" +iso_publisher="Parabola GNU/Linux-libre <https://parabolagnulinux.org>" +iso_application="Parabola Live/Rescue CD" +install_dir="libre" work_dir="work" out_dir="out" diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index f7f7abf..02f0fb5 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -2,10 +2,10 @@ set -e -u -iso_name=archlinux -iso_label="ARCH_$(date +%Y%m)" +iso_name=parabola +iso_label="PARABOLA_$(date +%Y%m)" iso_version=$(date +%Y.%m.%d) -install_dir=arch +install_dir=libre arch=$(uname -m) work_dir=work out_dir=out @@ -23,7 +23,7 @@ make_setup_mkinitcpio() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then 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 + cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-libreiso.conf : > ${work_dir}/build.${FUNCNAME} fi } @@ -33,10 +33,10 @@ make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' \ + -r 'mkinitcpio -c /etc/mkinitcpio-libreiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \ run - cp ${work_dir}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img - cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz + cp ${work_dir}/root-image/boot/libreiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img + cp ${work_dir}/root-image/boot/vmlinuz-linux-libre ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz : > ${work_dir}/build.${FUNCNAME} fi } diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index df63af6..a959e0a 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,8 +1,8 @@ UI menu.c32 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre -LABEL arch -MENU LABEL Arch Linux +LABEL libre +MENU LABEL Parabola GNU/Linux-libre LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz -INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img +INITRD /%INSTALL_DIR%/boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index cd9b45a..c21d8fd 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -2,10 +2,10 @@ set -e -u -iso_name=archlinux -iso_label="ARCH_$(date +%Y%m)" +iso_name=parabola +iso_label="LIBRE_$(date +%Y%m)" iso_version=$(date +%Y.%m.%d) -install_dir=arch +install_dir=libre arch=$(uname -m) work_dir=work out_dir=out @@ -43,7 +43,7 @@ make_setup_mkinitcpio() { done cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/root-image/usr/lib/initcpio/install cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/root-image/usr/lib/initcpio - cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf + cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-libreiso.conf : > ${work_dir}/build.${FUNCNAME} fi } @@ -55,10 +55,10 @@ make_boot() { local _dst_boot=${work_dir}/iso/${install_dir}/boot mkdir -p ${_dst_boot}/${arch} mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' \ + -r 'mkinitcpio -c /etc/mkinitcpio-libreiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \ run - mv ${_src}/boot/archiso.img ${_dst_boot}/${arch}/archiso.img - mv ${_src}/boot/vmlinuz-linux ${_dst_boot}/${arch}/vmlinuz + mv ${_src}/boot/libreiso.img ${_dst_boot}/${arch}/libreiso.img + mv ${_src}/boot/vmlinuz-linux-libre ${_dst_boot}/${arch}/vmlinuz cp ${_src}/boot/memtest86+/memtest.bin ${_dst_boot}/memtest cp ${_src}/usr/share/licenses/common/GPL2/license.txt ${_dst_boot}/memtest.COPYING : > ${work_dir}/build.${FUNCNAME} @@ -103,7 +103,7 @@ make_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 + cp ${work_dir}/iso/${install_dir}/boot/x86_64/libreiso.img ${work_dir}/efiboot/EFI/archiso/libreiso.img mkdir -p ${work_dir}/efiboot/EFI/boot cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi @@ -144,7 +144,7 @@ make_syslinux() { cp ${_src_syslinux}/memdisk ${_dst_syslinux} mkdir -p ${_dst_syslinux}/hdt cat ${work_dir}/root-image/usr/share/hwdata/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz - cat ${work_dir}/root-image/usr/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz + cat ${work_dir}/root-image/usr/lib/modules/*-LIBRE/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz : > ${work_dir}/build.${FUNCNAME} fi } @@ -169,9 +169,8 @@ make_customize_root_image() { chmod 750 ${work_dir}/root-image/etc/sudoers.d chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d - wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' - lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/root-image/root/install.txt - sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist + echo 'Server = http://repo.parabolagnulinux.org/$repo/os/$arch' > ${work_dir}/root-image/etc/pacman.d/mirrorlist + lynx -dump -nolist 'https://wiki.parabolagnulinux.org/Installation_Guide?action=render' >> ${work_dir}/root-image/root/install.txt patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen sed 's#\(^ExecStart=-/sbin/agetty\)#\1 --autologin root#' \ @@ -401,6 +400,7 @@ if [[ ${command_mode} == "all" && ${arch} != "x86_64" ]]; then echo "This mode <all> needs to be run on x86_64" _usage 1 fi +command_mode="${2}" if [[ ${command_mode} == "single" ]]; then work_dir=${work_dir}/${arch} diff --git a/configs/releng/efiboot/EFI/boot/startup.nsh b/configs/releng/efiboot/EFI/boot/startup.nsh new file mode 100644 index 0000000..1433751 --- /dev/null +++ b/configs/releng/efiboot/EFI/boot/startup.nsh @@ -0,0 +1,10 @@ +@echo -off + +for %m run (0 9) + if exist fs%m:\EFI\archiso\vmlinuz.efi then + fs%m: + cd fs%m:\EFI\archiso + echo "Launching Parabola GNU/Linux-libre ISO Kernel fs%m:\EFI\archiso\vmlinuz.efi" + vmlinuz.efi archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\EFI\archiso\libreiso.img + endif +endfor diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 821f9a5..bd04545 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -44,6 +44,7 @@ Architecture = auto # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux # packagers with `pacman-key --populate archlinux`. +# Also add the Parabola packagers keys `pacman-key --populate parabola` # # REPOSITORIES diff --git a/configs/releng/root-image/etc/hosts b/configs/releng/root-image/etc/hosts index d23291e..0b6242f 100644 --- a/configs/releng/root-image/etc/hosts +++ b/configs/releng/root-image/etc/hosts @@ -3,7 +3,7 @@ # #<ip-address> <hostname.domain.org> <hostname> -127.0.0.1 localhost.localdomain localhost archiso -::1 localhost.localdomain localhost archiso +127.0.0.1 localhost.localdomain localhost parabola +::1 localhost.localdomain localhost parabola # End of file diff --git a/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices new file mode 100644 index 0000000..f6b6062 --- /dev/null +++ b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices @@ -0,0 +1,7 @@ +symlink_used_block_devices() +{ + mkdir /run/aif + ln -s /run/archiso/used_block_devices /run/aif/ignore_block_devices +} + +add_hook multi_end symlink_used_block_devices diff --git a/configs/releng/root-image/root/install.txt b/configs/releng/root-image/root/install.txt index 3c8f171..e1f57ad 100644 --- a/configs/releng/root-image/root/install.txt +++ b/configs/releng/root-image/root/install.txt @@ -1,3 +1,3 @@ View this installation guide online at -https://wiki.archlinux.org/index.php/Installation_Guide +https://wiki.parabolagnulinux.org/Installation_Guide diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg index 81ad26e..278255d 100644 --- a/configs/releng/syslinux.dual/archiso_head.cfg +++ b/configs/releng/syslinux.dual/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND boot/syslinux/splash.png MENU WIDTH 78 diff --git a/configs/releng/syslinux.dual/archiso_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg index 4bdeefa..f3cb35e 100644 --- a/configs/releng/syslinux.dual/archiso_pxe32.cfg +++ b/configs/releng/syslinux.dual/archiso_pxe32.cfg @@ -1,32 +1,32 @@ LABEL arch32_nbd TEXT HELP -Boot the Arch Linux (i686) live medium (Using NBD). It allows you to install Arch Linux or +Boot the Parabola (i686) live medium (Using NBD). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (i686) (NBD) +MENU LABEL Boot Parabola (i686) (NBD) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} IPAPPEND 3 LABEL arch32_nfs TEXT HELP -Boot the Arch Linux (i686) live medium (Using NFS). It allows you to install Arch Linux or +Boot the Parabola (i686) live medium (Using NFS). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (i686) (NFS) +MENU LABEL Boot Parabola (i686) (NFS) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt IPAPPEND 3 LABEL arch32_http TEXT HELP -Boot the Arch Linux (i686) live medium (Using HTTP). It allows you to install Arch Linux or +Boot the Parabola (i686) live medium (Using HTTP). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (i686) (HTTP) +MENU LABEL Boot Parabola (i686) (HTTP) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ IPAPPEND 3 diff --git a/configs/releng/syslinux.dual/archiso_pxe64.cfg b/configs/releng/syslinux.dual/archiso_pxe64.cfg index 1676236..de66989 100644 --- a/configs/releng/syslinux.dual/archiso_pxe64.cfg +++ b/configs/releng/syslinux.dual/archiso_pxe64.cfg @@ -1,32 +1,32 @@ LABEL arch64_nbd TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NBD). It allows you to install Arch Linux or +Boot the Parabola (x86_64) live medium (Using NBD). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (NBD) +MENU LABEL Boot Parabola (x86_64) (NBD) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} IPAPPEND 3 LABEL arch64_nfs TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using NFS). It allows you to install Arch Linux or +Boot the Parabola (x86_64) live medium (Using NFS). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (NFS) +MENU LABEL Boot Parabola (x86_64) (NFS) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt IPAPPEND 3 LABEL arch64_http TEXT HELP -Boot the Arch Linux (x86_64) live medium (Using HTTP). It allows you to install Arch Linux or +Boot the Parabola (x86_64) live medium (Using HTTP). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) (HTTP) +MENU LABEL Boot Parabola (x86_64) (HTTP) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ IPAPPEND 3 diff --git a/configs/releng/syslinux.dual/archiso_sys32.cfg b/configs/releng/syslinux.dual/archiso_sys32.cfg index 261579e..082889e 100644 --- a/configs/releng/syslinux.dual/archiso_sys32.cfg +++ b/configs/releng/syslinux.dual/archiso_sys32.cfg @@ -1,9 +1,9 @@ -LABEL arch32 +LABEL libre32 TEXT HELP -Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or -perform system maintenance. +Boot the Parabola (i686) live medium. It allows you to install a fully libre +Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (i686) +MENU LABEL Boot Parabola (i686) LINUX boot/i686/vmlinuz -INITRD boot/i686/archiso.img +INITRD boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux.dual/archiso_sys64.cfg b/configs/releng/syslinux.dual/archiso_sys64.cfg index eb89813..409c5b2 100644 --- a/configs/releng/syslinux.dual/archiso_sys64.cfg +++ b/configs/releng/syslinux.dual/archiso_sys64.cfg @@ -1,9 +1,9 @@ -LABEL arch64 +LABEL libre64 TEXT HELP -Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or -perform system maintenance. +Boot the Parabola (x86_64) live medium. It allows you to install a fully libre +Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) +MENU LABEL Boot Parabola (x86_64) LINUX boot/x86_64/vmlinuz -INITRD boot/x86_64/archiso.img +INITRD boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index faa2588..765102c 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND boot/syslinux/splash.png MENU WIDTH 78 diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index 8bb60ed..a2f07cb 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -1,32 +1,32 @@ LABEL arch_nbd TEXT HELP -Boot the Arch Linux live medium (Using NBD). It allows you to install Arch Linux or +Boot the Parabola live medium (Using NBD). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (NBD) +MENU LABEL Boot Parabola (NBD) LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img +INITRD boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} IPAPPEND 3 LABEL arch_nfs TEXT HELP -Boot the Arch Linux live medium (Using NFS). It allows you to install Arch Linux or +Boot the Parabola live medium (Using NFS). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (NFS) +MENU LABEL Boot Parabola (NFS) LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img +INITRD boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt IPAPPEND 3 LABEL arch_http TEXT HELP -Boot the Arch Linux live medium (Using HTTP). It allows you to install Arch Linux or +Boot the Parabola live medium (Using HTTP). It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux (HTTP) +MENU LABEL Boot Parabola (HTTP) LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img +INITRD boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ IPAPPEND 3 diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index 35303db..54cafbe 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -1,9 +1,9 @@ LABEL arch TEXT HELP -Boot the Arch Linux live medium. It allows you to install Arch Linux or +Boot the Parabola live medium. It allows you to install Parabola or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux +MENU LABEL Boot Parabola GNU/Linux-libre LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img +INITRD boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/splash.png b/configs/releng/syslinux/splash.png Binary files differindex 64b959a..43d4692 100644 --- a/configs/releng/syslinux/splash.png +++ b/configs/releng/syslinux/splash.png |