mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 17:37:36 +02:00
Remove: Package 'alsa-tools' has been removed
Add: If a VM has been detected then any involved VM services will be enabled in the new system Add: A filesystem scan will take place after any filesystem formatting operation
This commit is contained in:
Jane Doe
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Amelia installer for Archlinux
|
||||
# Version: 1.1.9
|
||||
# Version: 1.1.10
|
||||
# Source: https://gitlab.com/prism7/archery
|
||||
# Contact: leenooks7@gmail.com
|
||||
|
||||
@@ -528,12 +528,14 @@ dtct_hyper() {
|
||||
hypervisor="$(systemd-detect-virt)"
|
||||
case "${hypervisor}" in
|
||||
kvm)
|
||||
vmpkgs="spice spice-vdagent spice-protocol spice-gtk qemu-guest-agent swtpm" ;;
|
||||
vmpkgs="spice spice-vdagent spice-protocol spice-gtk qemu-guest-agent swtpm"
|
||||
vm_services="qemu-guest-agent" ;;
|
||||
vmware)
|
||||
vmpkgs="open-vm-tools"
|
||||
vm_services="vmtoolsd vmware-vmblock-fuse" ;;
|
||||
oracle)
|
||||
vmpkgs="virtualbox-guest-utils" ;;
|
||||
vmpkgs="virtualbox-guest-utils"
|
||||
vm_services="vboxservice" ;;
|
||||
microsoft)
|
||||
vmpkgs="hyperv"
|
||||
vm_services="hv_kvp_daemon hv_vss_daemon" ;;
|
||||
@@ -3840,7 +3842,7 @@ partitioner() {
|
||||
fi
|
||||
|
||||
local stage_prompt="Partitioning Drive"
|
||||
wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
wipefs -afq "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
if [[ "${gptok}" != "yes" ]]; then
|
||||
sgdisk -Z "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -o "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
@@ -3850,25 +3852,25 @@ partitioner() {
|
||||
if [[ "${preset}" == "1" ]]; then
|
||||
sgdisk -I -n1:0:+1024M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
elif [[ "${preset}" == "2" ]]; then
|
||||
until set_swapsize; do : ; done
|
||||
sgdisk -I -n1:0:+1024M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
elif [[ "${preset}" == "3" ]]; then
|
||||
sgdisk -I -n1:0:+1024M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
elif [[ "${preset}" == "4" ]]; then
|
||||
until set_swapsize; do : ; done
|
||||
sgdisk -I -n1:0:+1024M -t1:ef00 -c1:ESP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe -s "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
partprobe "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
|
||||
fi
|
||||
if [[ "${install}" == "yes" ]]; then
|
||||
until sanity_check; do : ; done
|
||||
@@ -3934,7 +3936,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
||||
cgdisk "${cgdrive}"
|
||||
clear
|
||||
ok
|
||||
partprobe -s "${cgdrive}" > "${void}"
|
||||
partprobe "${cgdrive}" > "${void}"
|
||||
else
|
||||
invalid
|
||||
return 1
|
||||
@@ -5172,6 +5174,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
|
||||
==> [${green}Unformatted /Home Mounted OK${nc}] "
|
||||
fi
|
||||
fi
|
||||
blkid > "${void}" 2> "${log}"
|
||||
keypress
|
||||
}
|
||||
###################################################################################################
|
||||
@@ -5268,6 +5271,7 @@ Enter a partition number: "
|
||||
choice
|
||||
return 1
|
||||
fi
|
||||
blkid > "${void}" 2> "${log}"
|
||||
done
|
||||
}
|
||||
###################################################################################################
|
||||
@@ -5303,7 +5307,6 @@ Enter a partition number: "
|
||||
NC "
|
||||
|
||||
==> [${green}Format & Label /XBOOTLDR OK${nc}] "
|
||||
return 0
|
||||
else
|
||||
do_umount
|
||||
until manual_part; do : ; done
|
||||
@@ -5318,6 +5321,7 @@ Enter a partition number: "
|
||||
choice
|
||||
return 1
|
||||
fi
|
||||
blkid > "${void}" 2> "${log}"
|
||||
done
|
||||
}
|
||||
###################################################################################################
|
||||
@@ -5439,6 +5443,7 @@ Enter a name: "
|
||||
choice
|
||||
return 1
|
||||
fi
|
||||
blkid > "${void}" 2> "${log}"
|
||||
done
|
||||
}
|
||||
###################################################################################################
|
||||
@@ -5503,7 +5508,6 @@ Enter a name: "
|
||||
NC "
|
||||
|
||||
==> [${green}Label /Home OK${nc}] "
|
||||
return 0
|
||||
else
|
||||
err_try
|
||||
return 1
|
||||
@@ -5523,8 +5527,8 @@ Enter a name: "
|
||||
### ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED ${red}###
|
||||
---------------------------------------------------"
|
||||
skip
|
||||
return 0
|
||||
fi
|
||||
blkid > "${void}" 2> "${log}"
|
||||
done
|
||||
}
|
||||
###################################################################################################
|
||||
@@ -6025,6 +6029,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
|
||||
==> [${green}Filesystems OK${nc}]
|
||||
"
|
||||
keypress
|
||||
blkid > "${void}" 2> "${log}"
|
||||
sleep 0.2
|
||||
CYAN "
|
||||
###${nc}---------------------------------------------${cyan}[ ${bwhite}FILESYSTEM OVERVIEW ${nc}${cyan}]${nc}---------------------------------------------${cyan}###
|
||||
@@ -6139,7 +6144,7 @@ pkg_collection() {
|
||||
[[ "${vendor}" != "Virtual Machine" ]] && basepkgs+=(alsa-firmware linux-firmware sof-firmware)
|
||||
[[ "${terminal}" == "y" ]] && basepkgs+=(gnome-terminal)
|
||||
[[ "${nvdprop}" == "y" ]] && basepkgs+=("${kernel}-headers")
|
||||
[[ ! "${desktop}" =~ ^(11|12)$ ]] && basepkgs+=(7zip alsa-plugins alsa-tools alsa-utils bluez bluez-hid2hci bluez-obex bluez-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-alsa pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector usb_modeswitch xdg-user-dirs)
|
||||
[[ ! "${desktop}" =~ ^(11|12)$ ]] && basepkgs+=(7zip alsa-plugins alsa-utils bluez bluez-hid2hci bluez-obex bluez-utils exfatprogs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-pipewire gst-plugins-bad gst-plugins-good gst-plugins-ugly libfido2 man-db man-pages mesa-utils nano-syntax-highlighting pacman-contrib pipewire-alsa pipewire-libcamera pipewire-pulse pipewire-zeroconf reflector usb_modeswitch xdg-user-dirs)
|
||||
|
||||
case "${desktop}" in
|
||||
|
||||
|
||||
Reference in New Issue
Block a user