summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-05-03 16:06:59 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2018-07-02 10:50:36 -0400
commitaba3ee6528d73fcf8c3ca8210d117f3b9367616f (patch)
tree3cc4a2ffd37641b349afe95ea2873eb806bce22e /configs
parent139fb6038f7c00fd1c2d9284d24e2a1ef36a64a4 (diff)
squashme - houskeeping
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/profile/build.sh2
-rw-r--r--configs/profile/packages/packages-lxde.all2
-rw-r--r--configs/profile/pacman.conf2
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc8
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh2
5 files changed, 9 insertions, 7 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 1536dad..63cd056 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -281,7 +281,7 @@ make_efi() {
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
make_efiboot() {
# Cleanup in case of previous aborted run
- while mount | grep ${work_dir}/efiboot; do umount ${work_dir}/efiboot; sleep 1; done;
+ while mount | grep ${work_dir}/efiboot > /dev/null; do umount ${work_dir}/efiboot; sleep 1; done;
rm ${work_dir}/iso/EFI/parabolaiso/efiboot.img 2> /dev/null || true
# create EFI image
diff --git a/configs/profile/packages/packages-lxde.all b/configs/profile/packages/packages-lxde.all
index 907f020..968c910 100644
--- a/configs/profile/packages/packages-lxde.all
+++ b/configs/profile/packages/packages-lxde.all
@@ -8,7 +8,7 @@ galculator-gtk2
gnumeric
gparted
gpicview
-# gksu # (issue #1781)
+gksu
gnome-screenshot
lxappearance
lxappearance-obconf
diff --git a/configs/profile/pacman.conf b/configs/profile/pacman.conf
index 942f59d..e8a9f8a 100644
--- a/configs/profile/pacman.conf
+++ b/configs/profile/pacman.conf
@@ -91,10 +91,10 @@ Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist
+# TODO: move calamares, parabola-laf, wbar to 'pcr' then comment out 'pcr-testing'
[pcr-testing]
Include = /etc/pacman.d/mirrorlist
-# TODO: move calamares to 'pcr' then comment out 'pcr-testing'
[pcr]
Include = /etc/pacman.d/mirrorlist
diff --git a/configs/profile/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc
index e55744a..d0359a6 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -30,6 +30,8 @@ readonly OPENRC_SERVICES_GUI="alsasound \
readonly OPENRC_SERVICES="${OPENRC_SERVICES_ALL} ${OPENRC_SERVICES_GUI}"
[[ "${iso_gui}" == 'cli' ]] && readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL}" ||
readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} ${SYSTEMD_SERVICES_GUI}"
+[ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE='Complete' || \
+ readonly INSTALL_TYPE='NetInstall'
readonly DEFAULT_SHELL=/bin/bash
readonly NETINSTALL_MSG="To install Parabola, the system must be connected to the internet."
readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola system\n\
@@ -37,8 +39,8 @@ readonly COMPLETE_MSG="This ISO is capable of installing a complete Parabola sys
>>>>the latest packages from the internet, run the following command\n\
>>>>before beginning the install:\n\
# cp /etc/pacman-online.conf /etc/pacman.conf"
-[ "${enable_offline_install}" == 'false' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \
- readonly NETWORK_MOTD_MSG=${COMPLETE_MSG}
+[ "${INSTALL_TYPE}" == 'Complete' ] && readonly NETWORK_MOTD_MSG=${NETINSTALL_MSG} || \
+ readonly NETWORK_MOTD_MSG=${COMPLETE_MSG}
readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \
/etc/skel/.bash_profile \
/etc/skel/install-openrc-lxde.sh \
@@ -48,6 +50,4 @@ readonly LIVE_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,o
readonly OPENRC_USER_GROUPS="disk,sys"
[[ "${iso_init}" == 'openrc' ]] && readonly USER_GROUPS="${LIVE_USER_GROUPS},${OPENRC_USER_GROUPS}" ||
readonly USER_GROUPS="${LIVE_USER_GROUPS}"
-[ "${enable_offline_install}" == 'true' ] && readonly INSTALL_TYPE="Complete" || \
- readonly INSTALL_TYPE="NetInstall"
readonly PRETTY_NAME="$(echo ${iso_title} | cut -d ' ' -f -5) - (${INSTALL_TYPE})"
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 04990ac..163cde4 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -17,6 +17,8 @@ chmod 440 /etc/sudoers.d/g_wheel
# configure pacman
sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
+[ "${INSTALL_TYPE}" == 'Complete' ] && pacman_conf=pacman-offline.conf || pacman_conf=pacman-online.conf
+cp /etc/${pacman_conf} /etc/pacman.conf
# KLUDGE begin # FIXME: https://labs.parabola.nu/issues/1527
# if [[ "${arch}" == "i686" ]]
# then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist