Skip to content

Commit

Permalink
A little optimalisation and bug-fixes for the script. (helmuthdu#463)
Browse files Browse the repository at this point in the history
* Added the "--needed" option to pacstrap command

This prevents unnecessary reinstalling of software.

* Removed autofs from the install list

Autofs is no longer in the repositories. It IS in the aur, but cannot be verified with the pgp key.

* Removed Virtualbox Additions

Is no longer in the repos.
  • Loading branch information
Eroldin authored Nov 15, 2021
1 parent 92b681b commit 82a5a49
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions fifo
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ select_linux_version() {
pacstrap "${MOUNTPOINT}" \
cryptsetup lvm2 netctl dhcpcd inetutils jfsutils diffutils e2fsprogs \
less linux-firmware logrotate man-db man-pages mdadm nano \
perl reiserfsprogs s-nail sysfsutils texinfo usbutils vi which xfsprogs
perl reiserfsprogs s-nail sysfsutils texinfo usbutils vi which xfsprogs --needed
break
else
invalid_option
Expand All @@ -497,21 +497,21 @@ install_base_system() {
print_info "Using the pacstrap script we install the base system. The base-devel package group will be installed also."
rm "${MOUNTPOINT}""${EFI_MOUNTPOINT}"/vmlinuz-linux
select_linux_version
pacstrap "${MOUNTPOINT}" base-devel parted btrfs-progs f2fs-tools net-tools
pacstrap "${MOUNTPOINT}" base-devel parted btrfs-progs f2fs-tools net-tools --needed
[[ $? -ne 0 ]] && error_msg "Installing base system to ${MOUNTPOINT} failed. Check error messages above."
local PTABLE=$(parted -sl | grep "gpt")
[[ -n $PTABLE ]] && pacstrap "${MOUNTPOINT}" gptfdisk
[[ -n $PTABLE ]] && pacstrap "${MOUNTPOINT}" gptfdisk --needed
WIRELESS_DEV=$(ip link | grep wl | awk '{print $2}' | sed 's/://' | sed '1!d')
if [[ -n $WIRELESS_DEV ]]; then
pacstrap "${MOUNTPOINT}" iw wireless_tools wpa_supplicant dialog
pacstrap "${MOUNTPOINT}" iw wireless_tools wpa_supplicant dialog --needed
else
WIRED_DEV=$(ip link | grep "ens\|eno\|enp" | awk '{print $2}' | sed 's/://' | sed '1!d')
if [[ -n $WIRED_DEV ]]; then
arch_chroot "systemctl enable dhcpcd@${WIRED_DEV}.service"
fi
fi
if is_package_installed "espeakup"; then
pacstrap "${MOUNTPOINT}" alsa-utils
pacstrap "${MOUNTPOINT}" alsa-utils --needed
arch_chroot "systemctl enable espeakup.service"
fi
}
Expand Down Expand Up @@ -664,19 +664,19 @@ install_bootloader() {
select bootloader in "${bootloaders_list[@]}"; do
case "$REPLY" in
1)
pacstrap "${MOUNTPOINT}" grub os-prober
pacstrap "${MOUNTPOINT}" grub os-prober --needed
break
;;
2)
pacstrap "${MOUNTPOINT}" syslinux gptfdisk
pacstrap "${MOUNTPOINT}" syslinux gptfdisk --needed
break
;;
3)
break
;;
4)
if [[ $UEFI -eq 1 ]]; then
pacstrap "${MOUNTPOINT}" refind-efi os-prober
pacstrap "${MOUNTPOINT}" refind-efi os-prober --needed
break
else
invalid_option
Expand All @@ -690,7 +690,7 @@ install_bootloader() {
;;
esac
done
[[ $UEFI -eq 1 ]] && pacstrap "${MOUNTPOINT}" efibootmgr dosfstools
[[ $UEFI -eq 1 ]] && pacstrap "${MOUNTPOINT}" efibootmgr dosfstools --needed
}
#}}}
#CONFIGURE BOOTLOADER {{{
Expand Down
6 changes: 3 additions & 3 deletions lilo
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ install_basic_setup() {
pause_function
print_title "NTFS/FAT/exFAT/F2FS - https://wiki.archlinux.org/index.php/File_Systems"
print_info "A file system (or filesystem) is a means to organize data expected to be retained after a program terminates by providing procedures to store, retrieve and update data, as well as manage the available space on the device(s) which contain it. A file system organizes data in an efficient manner and is tuned to the specific characteristics of the device."
package_install "ntfs-3g dosfstools exfat-utils f2fs-tools fuse fuse-exfat autofs mtpfs"
package_install "ntfs-3g dosfstools exfat-utils f2fs-tools fuse fuse-exfat mtpfs"
pause_function
print_title "SYSTEMD-TIMESYNCD - https://wiki.archlinux.org/index.php/Systemd-timesyncd"
print_info "A file system (or filesystem) is a means to organize data expected to be retained after a program terminates by providing procedures to store, retrieve and update data, as well as manage the available space on the device(s) which contain it. A file system organizes data in an efficient manner and is tuned to the specific characteristics of the device."
Expand Down Expand Up @@ -776,9 +776,9 @@ install_video_cards() {
package_install "xf86-video-vmware"
fi
if [ "$(ls /boot | grep hardened -c)" -gt "0" ] || [ "$(ls /boot | grep lts -c)" -gt "0" ] || [ "$(ls /boot | grep zen -c)" -gt "0" ]; then
package_install "virtualbox-guest-dkms virtualbox-guest-utils mesa-libgl"
package_install "virtualbox-guest-utils mesa-libgl"
else
package_install "virtualbox-guest-modules-arch virtualbox-guest-utils mesa-libgl"
package_install "virtualbox-guest-utils mesa-libgl"
fi
add_module "vboxguest vboxsf vboxvideo" "virtualbox-guest"
add_user_to_group "${username}" vboxsf
Expand Down

0 comments on commit 82a5a49

Please sign in to comment.