openrc configs: replace pacman-init initscript with a local.d script

and remove haveged from pkglist

Signed-off-by: David P <megver83@parabola.nu>

4 files changed, 8 insertions, 49 deletions

diff --git a/configs/profile-openrc/airootfs/etc/init.d/pacman-init b/configs/profile-openrc/airootfs/etc/init.d/pacman-init
deleted file mode 100755
index b646e52..0000000
--- a/configs/profile-openrc/airootfs/etc/init.d/pacman-init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright (C) 2018 Parabola Project
-# Copyright (C) Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Initializes Pacman keyring"
-
-depend() {
-    use haveged
-    after haveged
-}
-
-start() {
-    # Check that there's no keyring, if there isn't, create one
-    if [ ! -d /etc/pacman.d/gnupg ]; then
-        ebegin "Initializing Pacman keyring"
-        pacman-key --init &> /dev/null &&
-        pacman-key --populate ${KEYS} &> /dev/null
-    else
-        ebegin "Pacman keyring already started"
-    fi
-}
-
-stop() {
-    # If there's a keyring, delete it
-    if [ -d /etc/pacman.d/gnupg ]; then
-        ebegin "Stoping Pacman keyring"
-        rm -rf /etc/pacman.d/gnupg
-    fi
-}
diff --git a/configs/profile-openrc/airootfs/etc/local.d/pacman-init.start b/configs/profile-openrc/airootfs/etc/local.d/pacman-init.start
new file mode 100755
index 0000000..5ab34f7
--- /dev/null
+++ b/configs/profile-openrc/airootfs/etc/local.d/pacman-init.start
@@ -0,0 +1,5 @@
+#!/bin/bash
+if ! [ -d /etc/pacman.d/gnupg ]; then
+  pacman-key --init
+  pacman-key --populate archlinux archlinux32 parabola
+fi
diff --git a/configs/profile-openrc/airootfs/root/customize_airootfs.sh b/configs/profile-openrc/airootfs/root/customize_airootfs.sh
index 09e8fcd..d01a51c 100755
--- a/configs/profile-openrc/airootfs/root/customize_airootfs.sh
+++ b/configs/profile-openrc/airootfs/root/customize_airootfs.sh
@@ -18,23 +18,8 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/elogind/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/elogind/logind.conf
 sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/elogind/logind.conf
 
-case $(uname -m) in
-	x86_64) echo 'KEYS="archlinux parabola"' > /etc/conf.d/pacman-init
-	;;
-	i686) echo 'KEYS="archlinux archlinux32 parabola"' > /etc/conf.d/pacman-init
-	;;
-esac
-
-useradd -m -p "" -g users -G "adm,audio,floppy,log,network,scanner,storage,optical,power,wheel,disk,sys" -s /usr/bin/zsh parabola
-
-services=(NetworkManager
-          elogind
-          dbus
-          haveged
-          pacman-init)
-
-for s in ${services[@]}; do
-  rc-update add $s default
-done
+rc-update add dbus boot
+rc-update add elogind default
+rc-update add NetworkManager default
 
 sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/profile-openrc/packages.both b/configs/profile-openrc/packages.both
index bd531f9..528250e 100644
--- a/configs/profile-openrc/packages.both
+++ b/configs/profile-openrc/packages.both
@@ -22,7 +22,6 @@ gpm-openrc
 gptfdisk
 grml-zsh-config
 grub
-haveged-openrc
 hdparm-openrc
 irssi
 iwd