Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

"do not install base-devel by default and formatting 'Installation Functions'

Browse Source 
- since atm it's mostly about testing the installer base-devel can be disabled I think.
This commit is contained in:
Bernhard Landauer 2017-02-12 17:35:18 +01:00
parent 59503579f8
commit 6bad85c481
1 changed files with 77 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manjaro-architect
View File

@ -1510,20 +1510,18 @@ install_base() {
"1" "systemd" \ "1" "systemd" \
"2" "openrc" 2>${INIT} "2" "openrc" 2>${INIT}
if [[ $(cat ${INIT}) -eq 2 ]]; then if [[ $(cat ${INIT}) -eq 2 ]]; then
touch /tmp/.openrc touch /tmp/.openrc
cat /usr/share/aif/package-lists/base-openrc-manjaro > /tmp/.base cat /usr/share/aif/package-lists/base-openrc-manjaro > /tmp/.base
else else
[[ -e /tmp/.openrc ]] && rm /tmp/.openrc [[ -e /tmp/.openrc ]] && rm /tmp/.openrc
cat /usr/share/aif/package-lists/base-systemd-manjaro > /tmp/.base cat /usr/share/aif/package-lists/base-systemd-manjaro > /tmp/.base
fi fi
# Choose kernel and possibly base-devel # Choose kernel and possibly base-devel
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstBseTitle " --checklist "$_InstStandBseBody$_UseSpaceBar" 0 0 12 \ dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstBseTitle " --checklist "$_InstStandBseBody$_UseSpaceBar" 0 0 12 \
$(cat /tmp/.available_kernels |awk '$0=$0" - off"') \ $(cat /tmp/.available_kernels |awk '$0=$0" - off"') \
"base-devel" "-" on 2>${PACKAGES} "base-devel" "-" off 2>${PACKAGES}
cat ${PACKAGES} >> /tmp/.base cat ${PACKAGES} >> /tmp/.base
# Choose wanted kernel modules # Choose wanted kernel modules
@ -1541,7 +1539,6 @@ install_base() {
"KERNEL-spl" "-" off \ "KERNEL-spl" "-" off \
"KERNEL-zfs" "-" off 2>/tmp/.modules "KERNEL-zfs" "-" off 2>/tmp/.modules
for kernel in $(cat ${PACKAGES} | grep -v "base-devel") ; do for kernel in $(cat ${PACKAGES} | grep -v "base-devel") ; do
cat /tmp/.modules | sed "s/KERNEL/\ $kernel/g" >> /tmp/.base cat /tmp/.modules | sed "s/KERNEL/\ $kernel/g" >> /tmp/.base
done done
@ -1563,20 +1560,26 @@ install_base() {
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ErrTitle " --msgbox "$_ErrNoKernel" 0 0 dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ErrTitle " --msgbox "$_ErrNoKernel" 0 0
install_base install_base
else else
# If at least one kernel selected, proceed with installation. # If at least one kernel selected, proceed with installation.
basestrap ${MOUNTPOINT} $(cat /tmp/.base) basestrap ${MOUNTPOINT} $(cat /tmp/.base)
# If root is on btrfs volume, amend mkinitcpio.conf # If root is on btrfs volume, amend mkinitcpio.conf
[[ $(lsblk -lno FSTYPE,MOUNTPOINT | awk '/ \/mnt$/ {print $1}') == btrfs ]] && sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf [[ $(lsblk -lno FSTYPE,MOUNTPOINT | awk '/ \/mnt$/ {print $1}') == btrfs ]] && sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf
# If root is on nilfs2 volume, amend mkinitcpio.conf # If root is on nilfs2 volume, amend mkinitcpio.conf
[[ $(lsblk -lno FSTYPE,MOUNTPOINT | awk '/ \/mnt$/ {print $1}') == nilfs2 ]] && sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf [[ $(lsblk -lno FSTYPE,MOUNTPOINT | awk '/ \/mnt$/ {print $1}') == nilfs2 ]] && sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf
# Use mhwd to install selected kernels with right kernel modules # Use mhwd to install selected kernels with right kernel modules
# This is as of yet untested # This is as of yet untested
# arch_chroot "mhwd-kernel -i $(cat ${PACKAGES} | xargs -n1 | grep -f /tmp/.available_kernels | xargs)" # arch_chroot "mhwd-kernel -i $(cat ${PACKAGES} | xargs -n1 | grep -f /tmp/.available_kernels | xargs)"
# If the virtual console has been set, then copy config file to installation # If the virtual console has been set, then copy config file to installation
[[ -e /tmp/vconsole.conf ]] && cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf 2>/tmp/.errlog [[ -e /tmp/vconsole.conf ]] && cp -f /tmp/vconsole.conf ${MOUNTPOINT}/etc/vconsole.conf 2>/tmp/.errlog
# If specified, copy over the pacman.conf file to the installation # If specified, copy over the pacman.conf file to the installation
[[ $COPY_PACCONF -eq 1 ]] && cp -f /etc/pacman.conf ${MOUNTPOINT}/etc/pacman.conf 2>>/tmp/.errlog [[ $COPY_PACCONF -eq 1 ]] && cp -f /etc/pacman.conf ${MOUNTPOINT}/etc/pacman.conf 2>>/tmp/.errlog
check_for_error check_for_error
# if branch was chosen, use that also in installed system. If not, use the system setting # if branch was chosen, use that also in installed system. If not, use the system setting
if [[ -e ${BRANCH} ]]; then if [[ -e ${BRANCH} ]]; then
sed -i "/Branch =/c\Branch = $(cat ${BRANCH})/" ${MOUNTPOINT}/etc/pacman-mirrors.conf sed -i "/Branch =/c\Branch = $(cat ${BRANCH})/" ${MOUNTPOINT}/etc/pacman-mirrors.conf
@ -1585,6 +1588,7 @@ install_base() {
fi fi
fi fi
fi fi
} }
install_bootloader() { install_bootloader() {