root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add hack for initscipts vs. systemd packages until repos are fine

Browse source
This commit is contained in:
Tobias Powalowski 2012-10-08 09:48:21 +02:00
parent c4d6617f51
commit 4ea55759ef
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr/share/archboot/installer/quickinst
View file

@ -172,12 +172,13 @@ install_packages() {
# Only install the booted kernel image!
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ linux\ # #g" -e "s#\ linux-lts\ # #g")"
PACKAGES="${KERNELPKG} ${PACKAGES}"
# remove not needed initscripts and sysvinit package with systemd and add compat package
### HACK
# until repository cleanup has been done, manually add systemd or initscripts components
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g" -e "s#\ systemd-sysvcompat\ # #g")"
if [[ "${SYSTEMD}" = "1" ]]; then
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g" -e "s#\ systemd-sysvcompat\ # #g")"
PACKAGES="${PACKAGES} systemd systemd-sysvcompat"
else
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ systemd-sysvcompat\ # #g")"
PACKAGES="${PACKAGES} initscripts sysvinit"
fi
${PACMAN} -S ${PACKAGES}
}

7
usr/share/archboot/installer/setup
View file

@ -3022,12 +3022,13 @@ select_packages() {
### TODO: This misses packages which pull in the kernel itself, like binary modules selected for the kernel!
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ linux\ # #g" -e "s#\ linux-lts\ # #g")"
PACKAGES="${KERNELPKG} ${PACKAGES}"
# remove not needed initscripts and sysvinit package with systemd and add compat package
### HACK
# until repository cleanup has been done, manually add systemd or initscripts components
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g" -e "s#\ systemd-sysvcompat\ # #g")"
if [[ "${SYSTEMD}" = "1" ]]; then
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g" -e "s#\ systemd-sysvcompat\ # #g")"
PACKAGES="${PACKAGES} systemd systemd-sysvcompat"
else
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ systemd-sysvcompat\ # #g")"
PACKAGES="${PACKAGES} initscripts sysvinit"
fi
NEXTITEM="6"
S_SELECT=1