diff options
Diffstat (limited to 'configs')
-rwxr-xr-x | configs/baseline/build.sh | 12 | ||||
-rw-r--r-- | configs/baseline/syslinux/syslinux.cfg | 8 | ||||
-rwxr-xr-x | configs/releng/build.sh | 14 | ||||
-rw-r--r-- | configs/releng/packages.i686 | 6 | ||||
-rw-r--r-- | configs/releng/packages.x86_64 | 6 | ||||
-rw-r--r-- | configs/releng/root-image/etc/hosts | 4 | ||||
-rw-r--r-- | configs/releng/root-image/etc/rc.conf | 2 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_head.cfg | 2 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_sys32.cfg | 9 | ||||
-rw-r--r-- | configs/releng/syslinux.dual/archiso_sys64.cfg | 10 | ||||
-rw-r--r-- | configs/releng/syslinux/splash.png | bin | 45400 -> 9932 bytes |
11 files changed, 33 insertions, 40 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index f7f7abf..06b76ba 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 @@ -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-archiso.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..7f5ac05 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 63cbad0..8d71d75 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 @@ -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-archiso.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} @@ -126,7 +126,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 } diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index be62a5a..dacc785 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -1,5 +1,4 @@ arch-install-scripts -b43-fwcutter btrfs-progs crda darkhttpd @@ -18,8 +17,6 @@ grml-zsh-config grub-bios haveged hdparm -ipw2100-fw -ipw2200-fw irssi lftp lilo @@ -40,7 +37,6 @@ pptpclient rp-pppoe rsync smartmontools -speedtouch sudo tcpdump usb_modeswitch @@ -48,7 +44,7 @@ vpnc wget wireless_tools wpa_actiond +zile wvdial xl2tpd -zd1211-firmware zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a5be3c4..277cf72 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,5 +1,4 @@ arch-install-scripts -b43-fwcutter btrfs-progs crda darkhttpd @@ -19,8 +18,6 @@ grub-bios grub-efi-x86_64 haveged hdparm -ipw2100-fw -ipw2200-fw irssi lftp lilo @@ -42,7 +39,6 @@ refind-efi-x86_64 rp-pppoe rsync smartmontools -speedtouch sudo tcpdump usb_modeswitch @@ -50,7 +46,7 @@ vpnc wget wireless_tools wpa_actiond +zile wvdial xl2tpd -zd1211-firmware zsh 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.conf b/configs/releng/root-image/etc/rc.conf index a2e6ebf..679b804 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -3,7 +3,7 @@ # /etc/rc.conf - configuration file for initscripts # # Most of rc.conf has been replaced by various other configuration -# files. See archlinux(7) for details. +# files. See parabola(7) for details. # # For more details on rc.conf see rc.conf(5). # 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_sys32.cfg b/configs/releng/syslinux.dual/archiso_sys32.cfg index 261579e..df79901 100644 --- a/configs/releng/syslinux.dual/archiso_sys32.cfg +++ b/configs/releng/syslinux.dual/archiso_sys32.cfg @@ -1,9 +1,10 @@ -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 Parabola (i686) MENU LABEL Boot Arch Linux (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/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 |