From 382e8dc1babb5400ef91eba9225a93af0bd3b65a Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Fri, 31 May 2013 16:03:06 +0200
Subject: [PATCH] remove netcfg hack, always add systemd-sysvcompat

---
 usr/share/archboot/installer/setup | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 72d9f9cf3..303a0790b 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -3040,15 +3040,9 @@ select_packages() {
     PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ linux\ # #g" -e  "s#\ linux-lts\ # #g")"
     PACKAGES="${KERNELPKG} ${PACKAGES}"
     ### HACK:
-    # manually add systemd-sysvcompat components
-    PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ sysvinit\ # #g" -e "s#\ systemd-sysvcompat\ # #g")"
+    # always add systemd-sysvcompat components
+    PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ systemd-sysvcompat\ # #g")"
     PACKAGES="${PACKAGES} systemd-sysvcompat"
-    ### HACK:
-    # replace netcfg with netctl if available in the repositories
-    if [[ $($PACMAN -Ss netctl) ]]; then
-        PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ netcfg\ # #g" -e "s#\ netctl\ # #g")"
-        PACKAGES="${PACKAGES} netctl"
-    fi
     ### HACK: circular depends are possible in base, install filesystem first!
     PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ filesystem\ # #g")"
     PACKAGES="filesystem ${PACKAGES}"