diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2019-03-30 09:01:50 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-19 14:18:55 -0400 |
| commit | cdfb2b6271f6a39d7ed43b9999c66b4423f4083c (patch) | |
| tree | 3a0545e4ad4c546412d4646c171f35ce46d2b7b2 /configs/profile/airootfs/root | |
| parent | 75b2777aa99f88674452a689839249faac53efc5 (diff) | |
enable [nonsystemd] for openrc ISOs
Diffstat (limited to 'configs/profile/airootfs/root')
| -rwxr-xr-x | configs/profile/airootfs/root/customize_airootfs.sh | 5 | ||||
| -rw-r--r-- | configs/profile/airootfs/root/customize_root_image-constants.inc | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh index 6bbc48e..2f7db97 100755 --- a/configs/profile/airootfs/root/customize_airootfs.sh +++ b/configs/profile/airootfs/root/customize_airootfs.sh @@ -22,8 +22,9 @@ chmod 440 /etc/sudoers.d/g_wheel 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 +[[ "${ISO_INIT}" == 'openrc' ]] && sed -i $NONSYSTEMD_REGEX /etc/pacman-online.conf +[[ "${INSTALL_TYPE}" == 'Complete' ]] && cp /etc/pacman-offline.conf /etc/pacman.conf || \ + cp /etc/pacman-online.conf /etc/pacman.conf LOG_CONFIG "services" diff --git a/configs/profile/airootfs/root/customize_root_image-constants.inc b/configs/profile/airootfs/root/customize_root_image-constants.inc index 38c149e..8d2902c 100644 --- a/configs/profile/airootfs/root/customize_root_image-constants.inc +++ b/configs/profile/airootfs/root/customize_root_image-constants.inc @@ -6,6 +6,8 @@ # HAS_BRLTTY_TTS +readonly NONSYSTEMD_REGEX='N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|' + readonly LOCALES="en_US\.UTF-8 \ eo \ es_ES\.UTF-8 \ @@ -63,11 +65,10 @@ readonly ROOT_SKEL_FILES="/etc/skel/.bash_logout \ /etc/skel/install-systemd-mate.sh" readonly LIVE_USER=parabola -readonly LIVE_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" +readonly DEFAULT_USER_GROUPS="adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" readonly OPENRC_USER_GROUPS="disk,sys" -[[ "${ISO_INIT}" == 'openrc' ]] && readonly USER_GROUPS="${LIVE_USER_GROUPS},${OPENRC_USER_GROUPS}" || - readonly USER_GROUPS="${LIVE_USER_GROUPS}" - +[[ "${ISO_INIT}" == 'openrc' ]] && readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS},${OPENRC_USER_GROUPS}" || + readonly LIVE_USER_GROUPS="${DEFAULT_USER_GROUPS}" readonly OS_PRETTY_NAME="$(echo ${ISO_TITLE} | cut -d ' ' -f -5) - (${INSTALL_TYPE})" readonly OS_VERSION=$( echo ${ISO_TITLE} | cut -d ' ' -f 6 ) readonly OS_VERSION_ID=$( echo ${ISO_TITLE} | cut -d ' ' -f 6 ) |