Merge branch 'master' of https://projects.archlinux.org/git/archiso

Conflicts:
	README
	configs/releng/build.sh
	configs/releng/efiboot/EFI/boot/startup_iso.nsh
	configs/releng/efiboot/EFI/boot/startup_usb.nsh
	configs/releng/packages.i686
	configs/releng/packages.x86_64
	configs/releng/root-image/etc/rc.conf
	configs/releng/root-image/etc/rc.d/pacman-init

1 files changed, 0 insertions, 34 deletions

diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init
deleted file mode 100755
index 596fe30..0000000
--- a/configs/releng/root-image/etc/rc.d/pacman-init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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 && pacman-key --populate parabola; } &>/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