diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2018-07-01 04:42:20 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-19 14:18:54 -0400 |
| commit | c359a56a380e2328479fae4810983bf148dd1016 (patch) | |
| tree | 2b9450f71c1f89f5204952bb8e2475e2c6d165cb /configs/profile/airootfs/root | |
| parent | b2a127619f1a5dcda221a3284b2ffeac6a434407 (diff) | |
squashme - braille
Diffstat (limited to 'configs/profile/airootfs/root')
| -rwxr-xr-x | configs/profile/airootfs/root/customize_airootfs.sh | 16 | ||||
| -rw-r--r-- | configs/profile/airootfs/root/customize_root_image-constants.inc | 20 |
2 files changed, 22 insertions, 14 deletions
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh index 353706e..f7f3877 100755 --- a/configs/profile/airootfs/root/customize_airootfs.sh +++ b/configs/profile/airootfs/root/customize_airootfs.sh @@ -6,27 +6,27 @@ set -e -u source /root/customize_root_image-constants.inc -# configure timezone and locales # +LOG_CONFIG "timezone and locales" ln -sf /usr/share/zoneinfo/UTC /etc/localtime for locale in ${LOCALES} ; do sed -i "s/#${locale}/${locale}/" /etc/locale.gen ; done ; locale-gen -# configure sudo # +LOG_CONFIG "sudo" chmod 750 /etc/sudoers.d chmod 440 /etc/sudoers.d/g_wheel -# configure pacman # +LOG_CONFIG "pacman" sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist [ "${INSTALL_TYPE}" == 'Complete' ] && cp /etc/pacman-offline.conf /etc/pacman.conf || \ cp /etc/pacman-online.conf /etc/pacman.conf -# configure services # +LOG_CONFIG "services" if [[ "${ISO_INIT}" == 'openrc' ]] then # delete files that are specific to other init systems @@ -59,7 +59,7 @@ else echo "invalid \$ISO_INIT for services '${ISO_INIT}'" fi -# configure root user, system defaults, and login session # +LOG_CONFIG "system defaults and root user" usermod -s ${DEFAULT_SHELL} root 2> /dev/null chmod 700 /root @@ -73,14 +73,16 @@ echo "VARIANT=\"${OS_VARIANT}\"" >> /usr/lib/os-release echo "VARIANT_ID=\"${OS_VARIANT_ID}\"" >> /usr/lib/os-release -# configure login session # +LOG_CONFIG "login session and live user" + +sed -i "s|_ENABLE_TTS_BRLTTY_|${ENABLE_TTS_BRLTTY}|" /etc/skel/.bash_profile if [[ "${ISO_GUI}" == 'cli' ]] then # configure CLI login session cp ${ROOT_SKEL_FILES} /root/ sed -i "s|_DESKTOP_SESSION_||" /root/.bash_profile -else # configure GUI login session and live user +else # configure GUI login session # configure live user [[ -n "$(id ${LIVE_USER} 2> /dev/null)" ]] && userdel -r ${LIVE_USER} 2> /dev/null diff --git a/configs/profile/airootfs/root/customize_root_image-constants.inc b/configs/profile/airootfs/root/customize_root_image-constants.inc index e8efb65..38c149e 100644 --- a/configs/profile/airootfs/root/customize_root_image-constants.inc +++ b/configs/profile/airootfs/root/customize_root_image-constants.inc @@ -3,6 +3,7 @@ # ISO_INIT # ISO_GUI # ENABLE_OFFLINE_INSTALL +# HAS_BRLTTY_TTS readonly LOCALES="en_US\.UTF-8 \ @@ -31,16 +32,18 @@ readonly OPENRC_SERVICES_ALL="dbus \ pacman-init " readonly OPENRC_SERVICES_GUI="alsasound \ elogind " -readonly SYSTEMD_SERVICES_ALL="brltty.service \ - choose-mirror.service \ - livecd-alsa-unmuter.service \ - multi-user.target \ - pacman-init.service " +readonly SYSTEMD_SERVICES_ALL="choose-mirror.service \ + multi-user.target \ + pacman-init.service " +readonly SYSTEMD_SERVICES_ACC="bluetooth.service \ + brltty.service \ + livecd-alsa-unmuter.service " readonly SYSTEMD_SERVICES_GUI="NetworkManager.service" readonly OPENRC_SERVICES="${OPENRC_SERVICES_ALL} \ $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${OPENRC_SERVICES_GUI}")" -readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} \ - $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${SYSTEMD_SERVICES_GUI}")" +readonly SYSTEMD_SERVICES="${SYSTEMD_SERVICES_ALL} \ + $([[ "${ISO_GUI}" != 'cli' ]] && echo " ${SYSTEMD_SERVICES_GUI}") \ + $([[ "${ENABLE_TTS_BRLTTY}" == 'yes' ]] && echo " ${SYSTEMD_SERVICES_ACC}")" readonly DEFAULT_SHELL=/bin/bash @@ -70,3 +73,6 @@ readonly OS_VERSION=$( echo ${ISO_TITLE} | cut -d ' ' -f 6 readonly OS_VERSION_ID=$( echo ${ISO_TITLE} | cut -d ' ' -f 6 ) readonly OS_VARIANT="$( echo ${OS_PRETTY_NAME} | cut -d ' ' -f -3 --complement )" readonly OS_VARIANT_ID=${ISO_INIT}-${ISO_GUI} + + +LOG_CONFIG() { printf "\033[01;34mconfiguring: %s\033[00m\n" "$(echo -e $*)" ; } |