2 files changed, 35 insertions, 1 deletions

diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf
index 6a640f5..d8dedec 100644
--- a/configs/releng/root-image/etc/rc.conf
+++ b/configs/releng/root-image/etc/rc.conf
@@ -30,4 +30,4 @@ USELVM="no"
 
 HOSTNAME="archiso"
 
-DAEMONS=(hwclock syslog-ng)
+DAEMONS=(hwclock syslog-ng haveged pacman-init)
diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init
new file mode 100755
index 0000000..bbbd719
--- /dev/null
+++ b/configs/releng/root-image/etc/rc.d/pacman-init
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+	start)
+		stat_busy "Initializing pacman keyring"
+		if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then
+			add_daemon pacman-init
+			stat_done
+		else
+			stat_fail
+			exit 1
+		fi
+		;;
+
+	stop)
+		stat_busy "Removing pacman keyring"
+		rm -rf /etc/pacman.d/gnupg
+		rm_daemon pacman-init
+		stat_done
+		;;
+
+	restart)
+		$0 stop
+		$0 start
+		;;
+
+	*)
+		echo "usage: $0 {start|stop|restart}"
+esac
+
+exit 0