From dcc19a73bf4a015ce9eed075cd51fea3f1e970a3 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 1 Jul 2018 04:42:20 -0400 Subject: squashme - braille --- configs/profile/root-image/root/customize_root_image.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'configs/profile/root-image/root/customize_root_image.sh') diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh index 681822b..ff5a2f3 100755 --- a/configs/profile/root-image/root/customize_root_image.sh +++ b/configs/profile/root-image/root/customize_root_image.sh @@ -6,20 +6,20 @@ 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 # FIXME: BEGIN issue #1838 @@ -28,7 +28,8 @@ echo -e "[pcr-testing]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman-onlin [ "${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}" == 'systemd' ]] then # delete files that are specific to other init systems @@ -53,7 +54,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 sed -i "s|_EDITION_TITLE_|${ISO_TITLE}|" /etc/motd @@ -65,14 +66,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 # FIXME: BEGIN issue #1838 groupadd -g 92 audio ; groupadd -g 6 disk ; groupadd -g 93 optical ; groupadd -g 95 storage ; # FIXME: END issue #1838 -- cgit v1.2.2