diff options
19 files changed, 65 insertions, 63 deletions
@@ -1,11 +1,13 @@ INDEX ----- +This is a rebranded fork of the original Archiso for Parabola GNU/Linux-libre. + * Image types generated by mkarchiso. * File format for aitab. -* Why the /isolinux and /arch/boot/syslinux directories? -* Building the most basic Arch Linux live media. (configs/baseline) -* Building official Arch Linux live media. (configs/releng) +* Why the /isolinux and /libre/boot/syslinux directories? +* Building the most basic Parabola live media. (configs/baseline) +* Building official Parabola live media. (configs/releng) @@ -52,13 +54,13 @@ Note: Some combinations are invalid, example: sfs_comp=none and fs_type=none The /isolinux directory holds files needed for the ISOLINUX boot loader module of SYSLINUX. ISOLINUX can not find config files on -/arch/boot/syslinux, like other boot loaders modules (EXTLINUX, SYSLINUX, etc). -When make your custom boot-pendrive, you need to copy /arch directory to it. -/isolinux/isolinux.cfg just holds /arch/boot/syslinux/syslinux.cfg +/libre/boot/syslinux, like other boot loaders modules (EXTLINUX, SYSLINUX, etc). +When make your custom boot-pendrive, you need to copy /libre directory to it. +/isolinux/isolinux.cfg just holds /libre/boot/syslinux/syslinux.cfg -*** Building the most basic Arch Linux live media. (configs/baseline) +*** Building the most basic Parabola live media. (configs/baseline) * First install devtools if needed, mkarchroot needs it. [host] # pacman -S devtools @@ -75,7 +77,7 @@ When make your custom boot-pendrive, you need to copy /arch directory to it. [chroot] # mknod /dev/loop0 b 7 0 * Setup a mirror. - [chroot] # echo 'Server = MIRROR/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist + [chroot] # echo 'Server = http://repo.parabolagnulinux.org/$repo/os/$arch' >> /etc/pacman.d/mirrorlist * Install aditional packages needed for mkarchiso. (git is only needed to get a copy of archiso.git) @@ -99,7 +101,7 @@ used to build official images with much more things. -*** Building official Arch Linux live media. (configs/releng) +*** Building official Parabola live media. (configs/releng) Note: These steps should be done with 64 bits support. @@ -107,7 +109,7 @@ Note: These steps should be done with 64 bits support. linux32 mkarchroot /tmp/chroot32 base linux32 mkarchroot -r bash /tmp/chroot32 -echo 'Server = MIRROR/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://repo.parabolagnulinux.org/$repo/os/$arch' >> /etc/pacman.d/mirrorlist pacman -S squashfs-tools syslinux devtools cdrkit make mkinitcpio-nfs-utils nbd --noconfirm --needed exit @@ -115,7 +117,7 @@ exit mkarchroot /tmp/chroot64 base mkarchroot -r bash /tmp/chroot64 -echo 'Server = MIRROR/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist +echo 'Server = http://repo.parabolagnulinux.org/$repo/os/$arch' >> /etc/pacman.d/mirrorlist pacman -S squashfs-tools syslinux devtools cdrkit make mkinitcpio-nfs-utils nbd --noconfirm --needed exit @@ -123,7 +125,7 @@ exit mkdir /tmp/shared cd /tmp/shared -git clone git://github.com/djgera/archiso.git -b dm-snapshot +git clone http://projects.parabolagnulinux.org/archiso.git cd mount --bind /tmp/shared /tmp/chroot32/tmp mount --bind /tmp/shared /tmp/chroot64/tmp diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 92b2a26..6c88474 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -7,10 +7,10 @@ arch=$(uname -m) pkg_list="" 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" # Show an INFO message # $1: message string diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 3c896e8..3561ec0 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" @@ -36,7 +36,7 @@ make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} cp ${work_dir}/root-image/boot/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${arch} - mkinitcpio -c ./mkinitcpio.conf -b ${work_dir}/root-image -k $(get_linux_ver) -g ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img + mkinitcpio -c ./mkinitcpio.conf -b ${work_dir}/root-image -k $(get_linux_ver) -g ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img : > ${work_dir}/build.${FUNCNAME} fi } diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index f755453..58c3209 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%/vmlinuz26 -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 1aa80fd..deaf9e2 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" @@ -38,7 +38,8 @@ make_customize_root_image() { rm -f ${work_dir}/root-image/etc/mtab fi 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/ + echo "Server = http://repo.parabolagnulinux.org/\$repo/os/\$arch" > \ + ${work_dir}/root-image/etc/pacman.d/mirrorlist sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist : > ${work_dir}/build.${FUNCNAME} fi @@ -51,7 +52,7 @@ make_boot() { local _dst_boot=${work_dir}/iso/${install_dir}/boot mkdir -p ${_dst_boot}/${arch} cp ${_src}/boot/vmlinuz26 ${_dst_boot}/${arch} - mkinitcpio -c ./mkinitcpio.conf -b ${_src} -k $(get_linux_ver) -g ${_dst_boot}/${arch}/archiso.img + mkinitcpio -c ./mkinitcpio.conf -b ${_src} -k $(get_linux_ver) -g ${_dst_boot}/${arch}/libreiso.img 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} 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 92236a2..a6295d0 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 @@ -30,6 +30,6 @@ USEDMRAID="no" USEBTRFS="no" USELVM="no" -HOSTNAME="archiso" +HOSTNAME="libreiso" DAEMONS=(hwclock syslog-ng archiso) diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso index 1429516..9d11d16 100755 --- a/configs/releng/root-image/etc/rc.d/archiso +++ b/configs/releng/root-image/etc/rc.d/archiso @@ -4,9 +4,9 @@ do_makeuser () { - stat_busy "Making the default user arch" + stat_busy "Making the default user libre" addgroups="audio,disk,optical,wheel" - useradd -m -p "" -g users -G $addgroups arch + useradd -m -p "" -g users -G $addgroups libre stat_done } 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 6947d75..e2575ae 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/vmlinuz26 -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 02ddc5a..e38e984 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/vmlinuz26 -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 de840f4..3d54c40 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%/vmlinuz26 -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 |
