summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2020-01-20 14:08:26 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-03-27 19:32:36 -0400
commit5c1cdb27e53cc929a7351ea846927c2252822f29 (patch)
treeb8a8fd088291328c01156676af39c5675d751cb5
parent469cd3a009df6ad493f98bbf185d3e98ff345971 (diff)
more transitional package adjustments
-rw-r--r--configs/profile/packages/packages-all.all2
-rw-r--r--configs/profile/packages/packages-openrc-gui.all2
-rw-r--r--configs/profile/packages/packages-openrc.all4
-rw-r--r--configs/profile/root-image/root/.install-openrc-lxde/packages4
-rw-r--r--configs/profile/root-image/root/.install-systemd-mate/packages3
-rwxr-xr-xconfigs/profile/root-image/root/customize_root_image.sh2
6 files changed, 11 insertions, 6 deletions
diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index 06e71cb..f631719 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -40,6 +40,7 @@ partimage
ppp
pptpclient
rp-pppoe
+screen
smartmontools
sudo
tcpdump
@@ -52,6 +53,7 @@ wget
wireless_tools
wvdial
xl2tpd
+# TODO: why is 'xterm' on the 'all' list
xterm
zile
zip
diff --git a/configs/profile/packages/packages-openrc-gui.all b/configs/profile/packages/packages-openrc-gui.all
index fbd05af..60d7c58 100644
--- a/configs/profile/packages/packages-openrc-gui.all
+++ b/configs/profile/packages/packages-openrc-gui.all
@@ -8,7 +8,7 @@ gvfs-mtp
gvfs-gphoto2
#openrc-desktop
# FIXME: https://labs.parabola.nu/issues/2506
-# these are conflict resoltuions for the transitional 'openrc-desktop' meta-package
+# these are conflict resolutions for the transitional 'nonsystemd/base' meta-package
# not including those defined in other files (e.g. packages-openrc.all)
# these can all be repalced eventually by the new 'openrc-desktop' meta-package
acpid-openrc
diff --git a/configs/profile/packages/packages-openrc.all b/configs/profile/packages/packages-openrc.all
index 34beb87..ca78094 100644
--- a/configs/profile/packages/packages-openrc.all
+++ b/configs/profile/packages/packages-openrc.all
@@ -14,9 +14,7 @@ openvpn-openrc
rsync-openrc
wpa_supplicant-openrc
# FIXME: https://labs.parabola.nu/issues/2506
-# these are conflict resoltuions for the transitional 'base' meta-package
+# these are conflict resolutions for the transitional 'nonsystemd/base' meta-package
# these can all be removed eventually after the new 'base' meta-package is stabilized
# https://labs.parabola.nu/issues/2576
systemd-libs-dummy
-# https://labs.parabola.nu/issues/2559
-opensysusers
diff --git a/configs/profile/root-image/root/.install-openrc-lxde/packages b/configs/profile/root-image/root/.install-openrc-lxde/packages
index b29de69..7cda0cf 100644
--- a/configs/profile/root-image/root/.install-openrc-lxde/packages
+++ b/configs/profile/root-image/root/.install-openrc-lxde/packages
@@ -1,6 +1,5 @@
base
systemd-libs-dummy
-opensysusers
parabola-base
gpm-openrc
haveged-openrc
@@ -12,7 +11,10 @@ openvpn-openrc
rsync-openrc
wpa_supplicant-openrc
bash-completion
+mc
+nano
p7zip
+screen
sudo
unarchiver
unzip
diff --git a/configs/profile/root-image/root/.install-systemd-mate/packages b/configs/profile/root-image/root/.install-systemd-mate/packages
index a07c6c0..6648a24 100644
--- a/configs/profile/root-image/root/.install-systemd-mate/packages
+++ b/configs/profile/root-image/root/.install-systemd-mate/packages
@@ -10,7 +10,10 @@ openvpn
rsync
wpa_supplicant
bash-completion
+mc
+nano
p7zip
+screen
sudo
unarchiver
unzip
diff --git a/configs/profile/root-image/root/customize_root_image.sh b/configs/profile/root-image/root/customize_root_image.sh
index 8c2c066..f82fe5f 100755
--- a/configs/profile/root-image/root/customize_root_image.sh
+++ b/configs/profile/root-image/root/customize_root_image.sh
@@ -26,7 +26,7 @@ LOG_CONFIG "pacman"
cp /etc/pacman-online.conf /etc/pacman.conf
# FIXME: https://labs.parabola.nu/issues/2576
# this LOC can be removed eventually after the new 'base' meta-package is stabilized
-pacman -R $(pacman -Qq | grep ^systemd-) netctl
+pacman -R $(pacman -Qq | grep ^systemd-)
LOG_CONFIG "services"