summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2017-12-21 18:48:47 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2019-10-19 13:59:26 -0400
commit46df1dd6a2902fb9a4309c771f29b9b7e462e755 (patch)
tree5336c43f50eb878663c09367be3fb496ae5cdd50
parent61026483d34cf7d3874e11f66abac19b9a416052 (diff)
squashme skel
-rw-r--r--configs/profile/airootfs/etc/skel/.xinitrc4
-rwxr-xr-xconfigs/profile/airootfs/root/customize_airootfs.sh16
-rw-r--r--configs/profile/airootfs/root/customize_root_image-constants.inc2
-rw-r--r--configs/profile/packages/cache-lxde.all6
-rw-r--r--configs/profile/packages/packages-gui.all11
5 files changed, 21 insertions, 18 deletions
diff --git a/configs/profile/airootfs/etc/skel/.xinitrc b/configs/profile/airootfs/etc/skel/.xinitrc
index ee22bef..b2cccac 100644
--- a/configs/profile/airootfs/etc/skel/.xinitrc
+++ b/configs/profile/airootfs/etc/skel/.xinitrc
@@ -37,9 +37,9 @@ fi
# start a destop environment
-if [ "${DESKTOP_SESSION}" == 'LXDE' ]
+if [ "${DESKTOP_SESSION}" == 'LXDE' ]
then exec startlxde
-if [ "${DESKTOP_SESSION}" == 'mate' ]
+elif [ "${DESKTOP_SESSION}" == 'mate' ]
then exec mate-session
else twm &
xclock -geometry 50x50-1+1 &
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh
index 9051ce7..2826514 100755
--- a/configs/profile/airootfs/root/customize_airootfs.sh
+++ b/configs/profile/airootfs/root/customize_airootfs.sh
@@ -17,12 +17,15 @@ chmod 440 /etc/sudoers.d/g_wheel
# configure pacman
sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
-
-# KLUDGE begin # TODO: https://labs.parabola.nu/issues/1527
+# KLUDGE begin # FIXME: https://labs.parabola.nu/issues/1527
if [[ "${arch}" == "i686" ]]
-then echo "Server = https://repomirror.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+then echo "Server = https://repo.parabola.nu/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
fi
# KLUDGE end
+# KLUDGE begin temp until next calamares rebuild # FIXME:
+cp /etc/pacman.conf /etc/pacman-offline.conf ; cp /etc/pacman.conf /etc/pacman-online.conf
+sed -i 's|requiredStorage:.*|requiredStorage: 8.9|' /usr/share/calamares/modules/welcome.conf
+# KLUDGE end
# configure services
if [[ "${iso_init}" == 'systemd' ]]
@@ -59,8 +62,8 @@ chmod 700 /root
sed -i "s|_EDITION_TITLE_|${iso_title}|" /etc/motd
sed -i "s|_NETWORK_MOTD_MSG_|${NETWORK_MOTD_MSG}| ; s|^>>>>\(.*\)| \1|g" /etc/motd
sed -i "s|PRETTY_NAME=.*|PRETTY_NAME=\"${PRETTY_NAME}\"|" /usr/lib/os-release
-echo "VERSION=\"$( echo ${iso_title} | cut -d ' ' -f 6)\"" >> /usr/lib/os-release
-echo "VERSION_ID=\"$(echo ${iso_title} | cut -d ' ' -f 6)\"" >> /usr/lib/os-release
+echo "VERSION=\"$( echo ${iso_title} | cut -d ' ' -f 6 )\"" >> /usr/lib/os-release
+echo "VERSION_ID=\"$(echo ${iso_title} | cut -d ' ' -f 6 )\"" >> /usr/lib/os-release
echo "VARIANT=\"$( echo ${PRETTY_NAME} | cut -d ' ' -f -3 --complement)\"" >> /usr/lib/os-release
echo "VARIANT_ID=\"${iso_init}-${iso_gui}\"" >> /usr/lib/os-release
@@ -88,6 +91,9 @@ else # configure GUI login session and live user
then rm -f /etc/xdg/autostart/octopi-notifier.desktop 2> /dev/null
sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.bash_profile
sed -i "s|_DESKTOP_SESSION_|LXDE|" /home/${LIVE_USER}/.dmrc
+ touch /home/${LIVE_USER}/Desktop/parabola-installer.desktop ; sleep 2 ; # sort
+ touch /home/${LIVE_USER}/Desktop/parabola-irc.desktop ; sleep 2 ; # sort
+ touch /home/${LIVE_USER}/Desktop/bug-tracker.desktop # sort
elif [[ "${iso_gui}" == 'mate' ]]
then sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.bash_profile
sed -i "s|_DESKTOP_SESSION_|mate|" /home/${LIVE_USER}/.dmrc
diff --git a/configs/profile/airootfs/root/customize_root_image-constants.inc b/configs/profile/airootfs/root/customize_root_image-constants.inc
index a183102..a334924 100644
--- a/configs/profile/airootfs/root/customize_root_image-constants.inc
+++ b/configs/profile/airootfs/root/customize_root_image-constants.inc
@@ -49,4 +49,4 @@ readonly OPENRC_USER_GROUPS="disk,sys"
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})"
+readonly PRETTY_NAME="$(echo ${iso_title} | cut -d ' ' -f -5) - (${INSTALL_TYPE})"
diff --git a/configs/profile/packages/cache-lxde.all b/configs/profile/packages/cache-lxde.all
index 67d1c9d..e653947 100644
--- a/configs/profile/packages/cache-lxde.all
+++ b/configs/profile/packages/cache-lxde.all
@@ -1,9 +1,3 @@
# this file specifies the packages that are to be downloaded
# and cached in the /isorepo directory for offline install in all live environments
# regardless of the architecture, init system, or graphical environment
-
-
-lightdm-gtk-greeter-settings
-mate
-mate-extra
-volumeicon
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index 21930fa..777e9e6 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -28,14 +28,12 @@ pulseaudio-alsa
# Network
gnome-keyring
-networkmanager
network-manager-applet
# GUI Programs
abiword
calamares
-dmidecode
gnumeric
gparted
icedove
@@ -49,15 +47,20 @@ pidgin
qtox
ring-client-gnome
smplayer
-zenity
# Theming
-grub2-theme-gnuaxiom
parabola-laf
xdg-user-dirs
+# Utilities
+dmidecode
+gxmessage
+gvfs
+wbar
+
+
# Xserver
ttf-dejavu
xorg-drivers