From a242d8f29a1b3a6c24f6e2dffbd9f78571bb1a69 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 17 Jul 2018 13:42:47 -0400 Subject: Release parabolaiso-v36 Signed-off-by: David P --- configs/lxde-openrc/build.sh | 14 ++++++++++++-- configs/lxde-openrc/mkinitcpio.conf | 2 +- configs/lxde-openrc/pacman.conf | 21 +++++++++++++++++++++ configs/profile-openrc/build.sh | 14 ++++++++++++-- configs/profile-openrc/mkinitcpio.conf | 2 +- configs/profile-openrc/pacman.conf | 21 +++++++++++++++++++++ configs/profile/build.sh | 14 ++++++++++++-- configs/profile/mkinitcpio.conf | 2 +- configs/profile/pacman.conf | 21 +++++++++++++++++++++ configs/talkingparabola/build.sh | 14 ++++++++++++-- configs/talkingparabola/mkinitcpio.conf | 2 +- configs/talkingparabola/pacman.conf | 21 +++++++++++++++++++++ parabolaiso/initcpio/hooks/parabolaiso | 4 ++++ parabolaiso/mkparabolaiso | 2 +- 14 files changed, 141 insertions(+), 13 deletions(-) diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh index f31cbd4..02f16cd 100755 --- a/configs/lxde-openrc/build.sh +++ b/configs/lxde-openrc/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=parabola-openrc-lxde iso_label="PARA_$(date +%Y%m)" +iso_publisher="Parabola GNU/Linux-libre " +iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version=$(date +%Y.%m.%d) iso_title="Parabola GNU/Linux-libre - LXDE Desktop LiveCD" install_dir=parabola @@ -34,6 +36,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -106,6 +112,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/${arch} + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt @@ -219,7 +227,7 @@ make_prepare() { # Build ISO make_iso() { - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -232,11 +240,13 @@ if [[ ${arch} != x86_64 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; diff --git a/configs/lxde-openrc/mkinitcpio.conf b/configs/lxde-openrc/mkinitcpio.conf index 9448579..182056a 100644 --- a/configs/lxde-openrc/mkinitcpio.conf +++ b/configs/lxde-openrc/mkinitcpio.conf @@ -1,3 +1,3 @@ MODULES="loop" -HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/lxde-openrc/pacman.conf b/configs/lxde-openrc/pacman.conf index 7ee4d57..0730db9 100644 --- a/configs/lxde-openrc/pacman.conf +++ b/configs/lxde-openrc/pacman.conf @@ -100,6 +100,27 @@ Include = /etc/pacman.d/mirrorlist [pcr] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the libre-multilib, multilib and pcr-multilib repositories as required here. + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/configs/profile-openrc/build.sh b/configs/profile-openrc/build.sh index ece7edb..a86a9cc 100755 --- a/configs/profile-openrc/build.sh +++ b/configs/profile-openrc/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=parabola-openrc iso_label="PARA_$(date +%Y%m)" +iso_publisher="Parabola GNU/Linux-libre " +iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version=$(date +%Y.%m.%d) install_dir=parabola work_dir=work @@ -33,6 +35,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -105,6 +111,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/${arch} + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt @@ -215,7 +223,7 @@ make_prepare() { # Build ISO make_iso() { - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -228,11 +236,13 @@ if [[ ${arch} != x86_64 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; diff --git a/configs/profile-openrc/mkinitcpio.conf b/configs/profile-openrc/mkinitcpio.conf index 9448579..182056a 100644 --- a/configs/profile-openrc/mkinitcpio.conf +++ b/configs/profile-openrc/mkinitcpio.conf @@ -1,3 +1,3 @@ MODULES="loop" -HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/profile-openrc/pacman.conf b/configs/profile-openrc/pacman.conf index 7ee4d57..0730db9 100644 --- a/configs/profile-openrc/pacman.conf +++ b/configs/profile-openrc/pacman.conf @@ -100,6 +100,27 @@ Include = /etc/pacman.d/mirrorlist [pcr] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the libre-multilib, multilib and pcr-multilib repositories as required here. + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 84b0b5c..eb1d134 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=parabola iso_label="PARA_$(date +%Y%m)" +iso_publisher="Parabola GNU/Linux-libre " +iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version=$(date +%Y.%m.%d) install_dir=parabola work_dir=work @@ -35,6 +37,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -105,6 +111,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/${arch} + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt @@ -219,7 +227,7 @@ make_prepare() { # Build ISO make_iso() { - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -232,11 +240,13 @@ if [[ ${arch} != x86_64 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; diff --git a/configs/profile/mkinitcpio.conf b/configs/profile/mkinitcpio.conf index f7a52b8..048facb 100644 --- a/configs/profile/mkinitcpio.conf +++ b/configs/profile/mkinitcpio.conf @@ -1,2 +1,2 @@ -HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/profile/pacman.conf b/configs/profile/pacman.conf index 03f449f..2de1d4f 100644 --- a/configs/profile/pacman.conf +++ b/configs/profile/pacman.conf @@ -97,6 +97,27 @@ Include = /etc/pacman.d/mirrorlist [pcr] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the libre-multilib, multilib and pcr-multilib repositories as required here. + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/configs/talkingparabola/build.sh b/configs/talkingparabola/build.sh index 3d4f325..a5d354e 100755 --- a/configs/talkingparabola/build.sh +++ b/configs/talkingparabola/build.sh @@ -4,6 +4,8 @@ set -e -u iso_name=talkingparabola iso_label="PARA_$(date +%Y%m)" +iso_publisher="Parabola GNU/Linux-libre " +iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version=$(date +%Y.%m.%d) install_dir=parabola work_dir=work @@ -35,6 +37,10 @@ _usage () echo " Default: ${iso_version}" echo " -L Set an iso label (disk label)" echo " Default: ${iso_label}" + echo " -P Set a publisher for the disk" + echo " Default: '${iso_publisher}'" + echo " -A Set an application name for the disk" + echo " Default: '${iso_application}'" echo " -D Set an install_dir (directory inside iso)" echo " Default: ${install_dir}" echo " -w Set the working directory" @@ -105,6 +111,8 @@ make_setup_mkinitcpio() { make_customize_airootfs() { cp -af ${script_path}/airootfs ${work_dir}/${arch} + cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc + curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on' lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt @@ -219,7 +227,7 @@ make_prepare() { # Build ISO make_iso() { - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" } if [[ ${EUID} -ne 0 ]]; then @@ -232,11 +240,13 @@ if [[ ${arch} != x86_64 ]]; then _usage 1 fi -while getopts 'N:V:L:D:w:o:g:vh' arg; do +while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do case "${arg}" in N) iso_name="${OPTARG}" ;; V) iso_version="${OPTARG}" ;; L) iso_label="${OPTARG}" ;; + P) iso_publisher="${OPTARG}" ;; + A) iso_application="${OPTARG}" ;; D) install_dir="${OPTARG}" ;; w) work_dir="${OPTARG}" ;; o) out_dir="${OPTARG}" ;; diff --git a/configs/talkingparabola/mkinitcpio.conf b/configs/talkingparabola/mkinitcpio.conf index 9448579..182056a 100644 --- a/configs/talkingparabola/mkinitcpio.conf +++ b/configs/talkingparabola/mkinitcpio.conf @@ -1,3 +1,3 @@ MODULES="loop" -HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block pcmcia filesystems keyboard) +HOOKS=(base udev memdisk parabolaiso_shutdown parabolaiso parabolaiso_loop_mnt parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/talkingparabola/pacman.conf b/configs/talkingparabola/pacman.conf index 03f449f..2de1d4f 100644 --- a/configs/talkingparabola/pacman.conf +++ b/configs/talkingparabola/pacman.conf @@ -97,6 +97,27 @@ Include = /etc/pacman.d/mirrorlist [pcr] Include = /etc/pacman.d/mirrorlist +# If you want to run 32 bit applications on your x86_64 system, +# enable the libre-multilib, multilib and pcr-multilib repositories as required here. + +#[libre-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[libre-multilib] +#Include = /etc/pacman.d/mirrorlist + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[pcr-multilib] +#Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso index ef79b2b..6499310 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso +++ b/parabolaiso/initcpio/hooks/parabolaiso @@ -33,6 +33,10 @@ _mnt_dmsnapshot() { dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}" + if [[ "${cow_persistent}" != "P" ]]; then + rm -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" + fi + _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults" echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/parabolaiso/used_block_devices } diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 4475244..ab81a67 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -273,7 +273,7 @@ command_pkglist () { _show_config pkglist _msg_info "Creating a list of installed packages on live-enviroment..." - pacman -Sl -r "${work_dir}/airootfs" --config "${pacman_conf}" | \ + pacman -Sl --sysroot "${work_dir}/airootfs" | \ awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \ "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" _msg_info "Done!" -- cgit v1.2.2