diff options
Diffstat (limited to 'configs/profile')
| -rwxr-xr-x | configs/profile/build.sh | 3 | ||||
| -rw-r--r-- | configs/profile/packages/packages-gui.all | 11 | ||||
| -rw-r--r-- | configs/profile/root-image/etc/skel/.xinitrc | 4 | ||||
| -rw-r--r-- | configs/profile/root-image/root/customize_root_image-constants.inc | 2 | ||||
| -rwxr-xr-x | configs/profile/root-image/root/customize_root_image.sh | 20 |
5 files changed, 28 insertions, 12 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index 35592bb..44b6c51 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -211,7 +211,8 @@ make_syslinux() { cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${iso_dirname}/boot/syslinux mkdir -p ${work_dir}/iso/${iso_dirname}/boot/syslinux/hdt gzip -c -9 ${work_dir}/${arch}/root-image/usr/share/hwdata/pci.ids > ${work_dir}/iso/${iso_dirname}/boot/syslinux/hdt/pciids.gz - gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${iso_dirname}/boot/syslinux/hdt/modalias.gz +# gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-gnu-*/modules.alias > ${work_dir}/iso/${iso_dirname}/boot/syslinux/hdt/modalias.gz +gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/4.14.7-1/modules.alias > ${work_dir}/iso/${iso_dirname}/boot/syslinux/hdt/modalias.gz # inject edition title sed -i "s|_EDITION_TITLE_|${iso_title}|" ${work_dir}/iso/${iso_dirname}/boot/syslinux/parabolaiso_head.cfg 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 diff --git a/configs/profile/root-image/etc/skel/.xinitrc b/configs/profile/root-image/etc/skel/.xinitrc index ee22bef..b2cccac 100644 --- a/configs/profile/root-image/etc/skel/.xinitrc +++ b/configs/profile/root-image/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/root-image/root/customize_root_image-constants.inc b/configs/profile/root-image/root/customize_root_image-constants.inc index a183102..a334924 100644 --- a/configs/profile/root-image/root/customize_root_image-constants.inc +++ b/configs/profile/root-image/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/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 7d626ba..4be89e0 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -17,12 +17,21 @@ 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 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 +echo "ls /etc/pacman.d/gnupg/ IN" ; ls -al /etc/pacman.d/gnupg/ # FIXME: +rm -rf /etc/pacman.d/gnupg/ +pacman-key --init +pacman-key --populate archlinux archlinux32 archlinuxarm parabola +pacman-key --refresh +echo "ls /etc/pacman.d/gnupg/ OUT" ; ls -al /etc/pacman.d/gnupg/ # FIXME: # configure services if [[ "${iso_init}" == 'systemd' ]] @@ -50,8 +59,8 @@ usermod -s ${DEFAULT_SHELL} root 2> /dev/null 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 @@ -79,6 +88,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 |