summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2020-01-01 06:10:43 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-01-01 06:17:50 -0500
commitb2c7c5295410ed7bad35e13ea451a02121de1c61 (patch)
tree9668c9ba6b0f0087cc930e833ac55f9120794240
parent19edf6a81dca72e1eb289655dea34875f546eef9 (diff)
wip - paralogo
-rwxr-xr-xconfigs/profile/build.sh2
-rw-r--r--configs/profile/packages/packages-all.all3
-rw-r--r--configs/profile/packages/packages-systemd.all2
3 files changed, 6 insertions, 1 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 3ae1a61..2ad80c1 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -213,6 +213,8 @@ make_setup_mkinitcpio() {
cp ${initcpio_dir}/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
cp ${initcpio_dir}/hooks/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio
cp ${releng_dir}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf
+ # FIXME: mkinitcpio-paralogo is systemd-only
+ [[ "${iso_init}" == 'openrc' ]]&& sed -i 's|paralogo||' ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf
[[ "${arch}" != 'i686' ]] && sed -i 's|pcmcia||' ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf
setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
}
diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index 4ea244f..db9dbdf 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -26,7 +26,8 @@ linux-atm
linux-libre
lynx
mc
-mkinitcpio-paralogo
+# FIXME: mkinitcpio-paralogo is systemd-only
+#mkinitcpio-paralogo
mtools
nfs-utils
nilfs-utils
diff --git a/configs/profile/packages/packages-systemd.all b/configs/profile/packages/packages-systemd.all
index 5963233..bbb78f5 100644
--- a/configs/profile/packages/packages-systemd.all
+++ b/configs/profile/packages/packages-systemd.all
@@ -6,6 +6,8 @@
gpm
haveged
hdparm
+# FIXME: mkinitcpio-paralogo is systemd-only
+mkinitcpio-paralogo
ntp
openssh
openvpn