summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-12-29 04:27:51 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-01-01 06:16:05 -0500
commitbc5eb8e4bbf453d0054023469c3fb9adabd2f675 (patch)
treee17b03bcb0b756730495380c2bd1d3bf5699f22d
parent3cd9094ae6d04bf9293d554a7eec722e298588ed (diff)
sq - housekeeping
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc2
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh4
2 files changed, 3 insertions, 3 deletions
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 2dec6b1..400f187 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/root/customize_root_image-constants.inc
@@ -81,7 +81,7 @@ readonly OPENRC_USER_GROUPS="disk,sys"
[[ "${ISO_INIT}" == 'openrc' ]] && readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS},${OPENRC_USER_GROUPS}" ||
readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS}"
-readonly TITLE_REGEX="^(.+) - (.+) (.+)"
+readonly TITLE_REGEX="^(.+) - (.+) (.+)$"
readonly TITLE_ERROR_MSG="malformed ISO title:\n\t'${ISO_TITLE}'"
! [[ "${ISO_TITLE}" =~ ${TITLE_REGEX} ]] && echo -e "${TITLE_ERROR_MSG}" && exit 1
readonly OS_PRETTY_NAME="${BASH_REMATCH[ 1]}"
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index c22d1e9..e370251 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -40,8 +40,8 @@ then # delete files that are specific to other init systems
for service in ${OPENRC_SERVICES} ; do rc-update add ${service} default ; done ;
# create the 'dbus' group and user if they do not exist
- if ! grep 'dbus' /etc/group > /dev/null ; then groupadd -g 81 dbus ; fi ;
- if ! grep 'dbus' /etc/passwd > /dev/null ; then useradd -r -s /sbin/nologin -u 81 -g 81 dbus ; fi ;
+ if ! grep -q 'dbus' /etc/group ; then groupadd -g 81 dbus ; fi ;
+ if ! grep -q 'dbus' /etc/passwd ; then useradd -r -s /sbin/nologin -u 81 -g 81 dbus ; fi ;
elif [[ "${ISO_INIT}" == 'systemd' ]]
then # delete files that are specific to other init systems