summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2019-03-30 09:01:50 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2019-12-27 03:35:09 -0500
commite4aeefb999326dfe6b93bf0daf29963b47865d88 (patch)
tree7288aad663371b026a3b29484cceb069a37a8686
parent1b1621bee189a09f331ff71fd0e43c548b2b3901 (diff)
enable [nonsystemd] for openrc ISOs
-rwxr-xr-xconfigs/profile/build.sh6
-rw-r--r--configs/profile/pacman.conf3
-rw-r--r--configs/profile/root-image/etc/pacman-online.conf3
-rw-r--r--configs/profile/root-image/root/customize_root_image-constants.inc9
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh5
5 files changed, 20 insertions, 6 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 9e5960e..27fea9f 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -91,7 +91,13 @@ make_pacman_conf() {
mv ${stash_dir}/* ${isorepo_dir} || true
fi
+ # enable [isorepo]
sed --regexp-extended 's|^#?\s*CacheDir.+|CacheDir = '${isorepo_dir}'|g' ${releng_dir}/pacman.conf > ${pacman_conf}
+
+ # enable [nonsystemd] for openrc ISOs
+ if [[ "${iso_init}" == 'openrc' ]]
+ then sed -i 'N ; s|^#\[nonsystemd\].*#Include|\[nonsystemd\]\nInclude|' ${pacman_conf}
+ fi
}
# Base installation, plus needed packages (root-image)
diff --git a/configs/profile/pacman.conf b/configs/profile/pacman.conf
index e8a9f8a..3fb9c0e 100644
--- a/configs/profile/pacman.conf
+++ b/configs/profile/pacman.conf
@@ -70,6 +70,9 @@ LocalFileSigLevel = Optional
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
+#[nonsystemd]
+#Include = /etc/pacman.d/mirrorlist
+
#[libre-testing]
#Include = /etc/pacman.d/mirrorlist
diff --git a/configs/profile/root-image/etc/pacman-online.conf b/configs/profile/root-image/etc/pacman-online.conf
index d77556f..1486e77 100644
--- a/configs/profile/root-image/etc/pacman-online.conf
+++ b/configs/profile/root-image/etc/pacman-online.conf
@@ -6,6 +6,9 @@ CheckSpace
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
+#[nonsystemd]
+#Include = /etc/pacman.d/mirrorlist
+
[libre]
Include = /etc/pacman.d/mirrorlist
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 38c149e..8d2902c 100644
--- a/configs/profile/root-image/root/customize_root_image-constants.inc
+++ b/configs/profile/root-image/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 )
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index eda5c64..c4b59eb 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.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"