quico-os-setup/arch-zbm
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

19-define-os-ip #24

Merged
hygienic-books merged 23 commits from 19-define-os-ip into main 2023-11-12 03:26:37 +00:00
Conversation 0 Commits 23 Files Changed 2 +29 -29
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c344aac77a - Show all commits

58
setup.sh
View File

@ -1512,20 +1512,20 @@ function umount_all () {
function finalize_os_setup () { function finalize_os_setup () {
#3.1 #3.1
set_root_pw #3.2 set_root_pw #3.2
configure_networking #3.3 configure_networking #3.3
if [[ "${ARCHZBM_OS_SSH_AUTH_KEYS}" ]]; then if [[ "${ARCHZBM_OS_SSH_AUTH_KEYS}" ]]; then
configure_sshd configure_sshd
fi fi
configure_dns #3.4 configure_dns #3.4
configure_ntp configure_ntp
configure_reflector #3.5 configure_reflector #3.5
configure_zfs #3.6 configure_zfs #3.6
configure_zfs_mount_gen #3.7 configure_zfs_mount_gen #3.7
if [[ "${part_schema}" = 'gpt' ]]; then if [[ "${part_schema}" = 'gpt' ]]; then
set_new_uefi_boot_entries #3.8 set_new_uefi_boot_entries #3.8
fi fi
umount_all #3.9 umount_all #3.9
} }
function main () { function main () {
@ -1533,29 +1533,29 @@ function main () {
arg_parse "${@}" arg_parse "${@}"
fi fi
if we_are_changerooted; then if we_are_changerooted; then
install_os_in_chroot #2.2 install_os_in_chroot #2.2
else else
no_kernel_update_in_iso #1.1 no_kernel_update_in_iso #1.1
set_ntp #1.2 set_ntp #1.2
resize_cow_space #1.3 resize_cow_space #1.3
update_pacman_db #1.4 update_pacman_db #1.4
install_pkgs 'jq' #1.5 install_pkgs 'jq' #1.5
install_zfs #1.6 install_zfs #1.6
uefi_or_bios #1.7 uefi_or_bios #1.7
load_settings_file #1.8 load_settings_file #1.8
setup_zpool #1.9 setup_zpool #1.9
mount_system #1.10 mount_system #1.10
copy_zpool_cache #1.11 copy_zpool_cache #1.11
install_archlinux #1.12 install_archlinux #1.12
gen_fstab #1.13 gen_fstab #1.13
set_hostname #1.14 set_hostname #1.14
set_locale #1.15 set_locale #1.15
add_zfs_hook_to_initramfs #1.16 add_zfs_hook_to_initramfs #1.16
set_initramfs_build_list #1.17 set_initramfs_build_list #1.17
add_zfs_files_to_new_os #1.18 add_zfs_files_to_new_os #1.18
enter_chroot #2.1 enter_chroot #2.1
# We're done in chroot # We're done in chroot
finalize_os_setup #3.1 finalize_os_setup #3.1
fi fi
} }