x/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2026-04-28 01:17:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add: 'timedatectl' will set NTP only when the installer runs as root

Browse Source 
Change: Btrfs subvolume mount options have been re-defined
This commit is contained in:
Jane Doe
2025-11-04 16:02:40 +02:00
parent 1c481b4ac0
commit 8c4bf67d11
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+20 -19
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 9.9.8 # Version: 9.9.9
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -507,6 +507,7 @@ ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}System
" "
sleep 0.2 sleep 0.2
timedatectl timedatectl
[[ "${run_as}" == "root" ]] && timedatectl set-ntp true
echo echo
ok ok
} }
@@ -3916,10 +3917,10 @@ Enter a disk number: "
volumes="$(fdisk -l | grep '^/dev' | cat --number)" volumes="$(fdisk -l | grep '^/dev' | cat --number)"
rota="$(lsblk "${instl_drive}" --nodeps --noheadings --output=rota | awk "{print \$1}")" rota="$(lsblk "${instl_drive}" --nodeps --noheadings --output=rota | awk "{print \$1}")"
if [[ "${rota}" == "0" ]]; then if [[ "${rota}" == "0" ]]; then
sbvl_mnt_opts="rw,noatime,compress=zstd:1" sbvl_mnt_opts="rw,noatime,compress=zstd:1,space_cache=v2"
trim="fstrim.timer" trim="fstrim.timer"
else else
sbvl_mnt_opts="rw,compress=zstd" sbvl_mnt_opts="rw,noatime,compress=zstd,space_cache=v2"
fi fi
parttable="$(fdisk -l "${instl_drive}" | grep '^Disklabel type' | awk "{print \$3}")" parttable="$(fdisk -l "${instl_drive}" | grep '^Disklabel type' | awk "{print \$3}")"
if [[ "${parttable}" != "gpt" && -n "${gptabort}" ]]; then if [[ "${parttable}" != "gpt" && -n "${gptabort}" ]]; then
@@ -5076,14 +5077,14 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
fi fi
umount /mnt > "${void}" 2> "${log}" || err_abort umount /mnt > "${void}" 2> "${log}" || err_abort
mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@swap "${root_dev}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}/@ OK${nc}] ==> [${green}/@ OK${nc}]
@@ -5641,14 +5642,14 @@ Enter your${nc} ${cyan}${roottype} ${blue}partition number: "
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
elif [[ "${fs}" == "2" ]]; then elif [[ "${fs}" == "2" ]]; then
if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > "${void}" 2> "${log}" ; then if mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt > "${void}" 2> "${log}" ; then
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@swap "${rootpart}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
sleep 0.2 sleep 0.2
ok ok
return 0 return 0
@@ -6011,21 +6012,21 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
btrfs subvolume create /mnt/@home > "${void}" 2> "${log}" || err_abort btrfs subvolume create /mnt/@home > "${void}" 2> "${log}" || err_abort
btrfs subvolume create /mnt/@cache > "${void}" 2> "${log}" || err_abort btrfs subvolume create /mnt/@cache > "${void}" 2> "${log}" || err_abort
btrfs subvolume create /mnt/@log > "${void}" 2> "${log}" || err_abort btrfs subvolume create /mnt/@log > "${void}" 2> "${log}" || err_abort
btrfs subvolume create /mnt/@snapshots > "${void}" 2> "${log}" || err_abort
btrfs subvolume create /mnt/@tmp > "${void}" 2> "${log}" || err_abort btrfs subvolume create /mnt/@tmp > "${void}" 2> "${log}" || err_abort
btrfs subvolume create /mnt/@snapshots > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then if [[ "${swapmode}" == "2" ]]; then
btrfs subvolume create /mnt/@swap > "${void}" 2> "${log}" || err_abort btrfs subvolume create /mnt/@swap > "${void}" 2> "${log}" || err_abort
fi fi
umount /mnt > "${void}" 2> "${log}" || err_abort umount /mnt > "${void}" 2> "${log}" || err_abort
mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > "${void}" 2> "${log}" || err_abort mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp > "${void}" 2> "${log}" || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" > "${void}" 2> "${log}" || err_abort
if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap > "${void}" 2> "${log}" || err_abort
fi
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Encrypted /@ OK${nc}] ==> [${green}Encrypted /@ OK${nc}]