diff options
Diffstat (limited to 'configs')
18 files changed, 57 insertions, 62 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index a3775c0..780194d 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -2,10 +2,10 @@ set -e -u -name=archlinux -iso_label="ARCH_$(date +%Y%m)" +name=parabola +iso_label="PARABOLA_$(date +%Y%m)" version=$(date +%Y.%m.%d) -install_dir=arch +install_dir=libre arch=$(uname -m) work_dir=work verbose="n" @@ -34,9 +34,9 @@ make_boot() { mkinitcpio \ -c ${script_path}/mkinitcpio.conf \ -b ${work_dir}/root-image \ - -k /boot/vmlinuz-linux \ - -g ${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 + -k /boot/vmlinuz-linux-libre \ + -g ${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 5ae9823..6bd59a5 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,12 +1,12 @@ DEFAULT menu.c32 PROMPT 0 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre TIMEOUT 300 -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% -ONTIMEOUT arch +ONTIMEOUT libre diff --git a/configs/releng/build.sh b/configs/releng/build.sh index ab7aae7..8c96c76 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -2,10 +2,10 @@ set -e -u -name=archlinux -iso_label="ARCH_$(date +%Y%m)" +name=parabola +iso_label="LIBRE_$(date +%Y%m)" version=$(date +%Y.%m.%d) -install_dir=arch +install_dir=libre arch=$(uname -m) work_dir=work verbose="n" @@ -30,10 +30,13 @@ 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 http://www.archlinux.org/mirrorlist/all/ - 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 chroot ${work_dir}/root-image /usr/sbin/locale-gen - chroot ${work_dir}/root-image /usr/sbin/useradd -m -p "" -g users -G "audio,disk,optical,wheel" arch + chroot ${work_dir}/root-image /usr/sbin/useradd -m -p "" -g users -G "audio,disk,optical,wheel" libre +# Cleanup, makes the ISO lighter +# Remove headers + rm -rf ${work_dir}/root-image/usr/include/* : > ${work_dir}/build.${FUNCNAME} fi } @@ -59,9 +62,9 @@ make_boot() { mkinitcpio \ -c ${script_path}/mkinitcpio.conf \ -b ${_src} \ - -k /boot/vmlinuz-linux \ - -g ${_dst_boot}/${arch}/archiso.img - mv ${_src}/boot/vmlinuz-linux ${_dst_boot}/${arch}/vmlinuz + -k /boot/vmlinuz-linux-libre \ + -g ${_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} @@ -84,7 +87,7 @@ make_syslinux() { cp ${_src_syslinux}/memdisk ${_dst_syslinux} mkdir -p ${_dst_syslinux}/hdt wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > ${_dst_syslinux}/hdt/pciids.gz - cat ${work_dir}/root-image/lib/modules/*-ARCH/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz + cat ${work_dir}/root-image/lib/modules/*-LIBRE/modules.alias | gzip -9 > ${_dst_syslinux}/hdt/modalias.gz : > ${work_dir}/build.${FUNCNAME} fi } @@ -116,6 +119,7 @@ make_usr_share() { } # Make [core] repository, keep "any" pkgs in a separate fs (makes more "dual-iso" friendly) +# TODO add 'base' packages on [libre] make_core_repo() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then local _url _urls _pkg_name _cached_pkg _dst diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index a7427aa..b4633ac 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -1,5 +1,4 @@ aif -b43-fwcutter btrfs-progs-unstable crda curl @@ -14,8 +13,6 @@ elinks gnu-netcat hdparm inetutils -ipw2100-fw -ipw2200-fw lftp lilo netcfg @@ -32,9 +29,8 @@ parted pptpclient rp-pppoe rsync -speedtouch tcpdump vpnc wireless_tools wpa_actiond -zd1211-firmware +zile diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a7427aa..b4633ac 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,5 +1,4 @@ aif -b43-fwcutter btrfs-progs-unstable crda curl @@ -14,8 +13,6 @@ elinks gnu-netcat hdparm inetutils -ipw2100-fw -ipw2200-fw lftp lilo netcfg @@ -32,9 +29,8 @@ parted pptpclient rp-pppoe rsync -speedtouch tcpdump vpnc wireless_tools wpa_actiond -zd1211-firmware +zile diff --git a/configs/releng/root-image/etc/arch-release b/configs/releng/root-image/etc/arch-release index 153f8b2..d04512c 100644 --- a/configs/releng/root-image/etc/arch-release +++ b/configs/releng/root-image/etc/arch-release @@ -1 +1 @@ -Arch Linux Live ISO +Parabola GNU/Linux-libre Live ISO diff --git a/configs/releng/root-image/etc/hosts b/configs/releng/root-image/etc/hosts index e474be0..f26c713 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 libreiso +::1 localhost.localdomain localhost libreiso # End of file diff --git a/configs/releng/root-image/etc/issue b/configs/releng/root-image/etc/issue index ce82e88..2e5b032 100644 --- a/configs/releng/root-image/etc/issue +++ b/configs/releng/root-image/etc/issue @@ -1,5 +1,5 @@ [H[2J -Arch Linux Live ISO (\l) +Parabola GNU/Linux-libre Live ISO (\l) \s-\r \m. -Default logins "root" and "arch" have no password. +Default logins "root" and "libre" have no password. To begin installation, login as root. diff --git a/configs/releng/root-image/etc/motd b/configs/releng/root-image/etc/motd index ddd9fbc..0943569 100644 --- a/configs/releng/root-image/etc/motd +++ b/configs/releng/root-image/etc/motd @@ -1,5 +1,5 @@ ************************************************************** -* To begin installation, run /arch/setup * +* To begin installation, run /libre/setup * * You can find documentation at * * /usr/share/aif/docs/official_installation_guide_en * * * @@ -7,10 +7,9 @@ * and console font. * * * * If you encounter issues and want to report them or * -* seek help, run /arch/report-issues * +* seek help, run /libre/report-issues * * * -* If you are looking to install Arch on something more * -* exotic, such as your kerosene-powered cheese grater, * -* please consult http://wiki.archlinux.org. * +* If you need help please consult * +* http://wiki.parabolagnulinux.org * * * ************************************************************** diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf index 42084f6..14775ee 100644 --- a/configs/releng/root-image/etc/rc.conf +++ b/configs/releng/root-image/etc/rc.conf @@ -1,5 +1,5 @@ # -# /etc/rc.conf - Main Configuration for Arch Linux +# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-libre . /etc/archiso/functions @@ -28,6 +28,6 @@ USEDMRAID="no" USEBTRFS="no" USELVM="no" -HOSTNAME="archiso" +HOSTNAME="libreiso" DAEMONS=(hwclock syslog-ng archiso) diff --git a/configs/releng/root-image/arch/report-issues b/configs/releng/root-image/libre/report-issues index bf3b3a3..bf3b3a3 100755 --- a/configs/releng/root-image/arch/report-issues +++ b/configs/releng/root-image/libre/report-issues diff --git a/configs/releng/root-image/arch/setup b/configs/releng/root-image/libre/setup index 908d106..908d106 100755 --- a/configs/releng/root-image/arch/setup +++ b/configs/releng/root-image/libre/setup diff --git a/configs/releng/syslinux.dual/syslinux_arch32.cfg b/configs/releng/syslinux.dual/syslinux_arch32.cfg index 9b4030e..d6180f6 100644 --- a/configs/releng/syslinux.dual/syslinux_arch32.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch32.cfg @@ -1,11 +1,11 @@ -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 /%INSTALL_DIR%/boot/i686/vmlinuz -INITRD /%INSTALL_DIR%/boot/i686/archiso.img +INITRD /%INSTALL_DIR%/boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/configs/releng/syslinux.dual/syslinux_arch64.cfg b/configs/releng/syslinux.dual/syslinux_arch64.cfg index 6cc644d..64f2269 100644 --- a/configs/releng/syslinux.dual/syslinux_arch64.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch64.cfg @@ -1,11 +1,11 @@ -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 /%INSTALL_DIR%/boot/x86_64/vmlinuz -INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img +INITRD /%INSTALL_DIR%/boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/configs/releng/syslinux.dual/syslinux_head.cfg b/configs/releng/syslinux.dual/syslinux_head.cfg index 2f692f8..84a755f 100644 --- a/configs/releng/syslinux.dual/syslinux_head.cfg +++ b/configs/releng/syslinux.dual/syslinux_head.cfg @@ -1,6 +1,6 @@ DEFAULT vesamenu.c32 PROMPT 0 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png TIMEOUT 3000 diff --git a/configs/releng/syslinux.dual/syslinux_tail.cfg b/configs/releng/syslinux.dual/syslinux_tail.cfg index 7dd1270..a8441a9 100644 --- a/configs/releng/syslinux.dual/syslinux_tail.cfg +++ b/configs/releng/syslinux.dual/syslinux_tail.cfg @@ -26,4 +26,4 @@ LABEL poweroff MENU LABEL Power Off COMBOOT poweroff.com -ONTIMEOUT arch32 +ONTIMEOUT libre32 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 diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg index 7762278..14f48e6 100644 --- a/configs/releng/syslinux/syslinux.cfg +++ b/configs/releng/syslinux/syslinux.cfg @@ -1,7 +1,7 @@ SERIAL 0 38400 DEFAULT vesamenu.c32 PROMPT 0 -MENU TITLE Arch Linux +MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png TIMEOUT 3000 @@ -27,14 +27,14 @@ MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std MENU COLOR msg07 37;40 #90ffffff #a0000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std -LABEL arch +LABEL libre TEXT HELP -Boot the Arch Linux live medium. It allows you to install Arch Linux or -perform system maintenance. +Boot the Parabola live medium. It allows you to install a fully libre +Arch Linux or perform system maintenance. ENDTEXT -MENU LABEL Boot Arch Linux +MENU LABEL Boot 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% # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 @@ -67,4 +67,4 @@ LABEL poweroff MENU LABEL Power Off COMBOOT poweroff.com -ONTIMEOUT arch +ONTIMEOUT libre |
