remove netcfg hack, always add systemd-sysvcompat

This commit is contained in:
Tobias Powalowski 2013-05-31 16:03:06 +02:00
parent bad936efd5
commit 382e8dc1ba

View file

@ -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}"