diff options
Diffstat (limited to 'configs/releng')
-rwxr-xr-x | configs/releng/build.sh | 24 | ||||
-rw-r--r-- | configs/releng/efiboot/EFI/boot/startup.nsh | 10 | ||||
-rw-r--r-- | configs/releng/pacman.conf | 1 | ||||
-rw-r--r-- | configs/releng/root-image/etc/hosts | 4 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices | 7 | ||||
-rw-r--r-- | configs/releng/root-image/root/install.txt | 2 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_head.cfg | 2 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_pxe32.cfg | 18 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_pxe64.cfg | 18 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_sys32.cfg | 10 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_sys64.cfg | 10 | ||||
-rw-r--r-- | configs/releng/syslinux/archiso_head.cfg | 2 | ||||
-rw-r--r-- | configs/releng/syslinux/archiso_pxe.cfg | 18 | ||||
-rw-r--r-- | configs/releng/syslinux/archiso_sys.cfg | 6 | ||||
-rw-r--r-- | configs/releng/syslinux/splash.png | bin | 45400 -> 9932 bytes |
15 files changed, 75 insertions, 57 deletions
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 |