Merge pull request '26-install-zfs-only-when-needed' (#27) from 26-install-zfs-only-when-needed into main
Reviewed-on: #27
This commit is contained in:
commit
15d67f2e3f
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
archzbm_settings.env
|
archzbm_settings.env
|
||||||
|
.idea
|
||||||
|
12
setup.sh
12
setup.sh
@ -451,7 +451,12 @@ function install_pkgs () {
|
|||||||
function install_zfs () {
|
function install_zfs () {
|
||||||
#1.6
|
#1.6
|
||||||
declare reset_colors='\033[0m'
|
declare reset_colors='\033[0m'
|
||||||
|
if modinfo 'zfs' &>/dev/null; then
|
||||||
|
>&3 printf -- '%s\n' \
|
||||||
|
'ZFS kernel module is loaded, no need to install ...'
|
||||||
|
else
|
||||||
curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash
|
curl -s 'https://raw.githubusercontent.com/eoli3n/archiso-zfs/master/init' | bash
|
||||||
|
fi
|
||||||
printf -- "${reset_colors}"
|
printf -- "${reset_colors}"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1300,6 +1305,10 @@ function get_disks_with_one_efipart () {
|
|||||||
|
|
||||||
function install_os_in_chroot () {
|
function install_os_in_chroot () {
|
||||||
#2.2
|
#2.2
|
||||||
|
dd if='/dev/zero' of='/swapfile' bs='1M' count='2048'
|
||||||
|
losetup '/dev/loop9' '/swapfile'
|
||||||
|
mkswap '/dev/loop9'
|
||||||
|
swapon '/dev/loop9'
|
||||||
### Reinit keyring
|
### Reinit keyring
|
||||||
# As keyring is initialized at boot, and copied to the install dir with pacstrap, and ntp is running
|
# As keyring is initialized at boot, and copied to the install dir with pacstrap, and ntp is running
|
||||||
# Time changed after keyring initialization, it leads to malfunction
|
# Time changed after keyring initialization, it leads to malfunction
|
||||||
@ -1346,6 +1355,9 @@ function install_os_in_chroot () {
|
|||||||
add_syslinux_pacman_hook
|
add_syslinux_pacman_hook
|
||||||
fi
|
fi
|
||||||
add_zbm_pacman_hook
|
add_zbm_pacman_hook
|
||||||
|
swapoff '/dev/loop9'
|
||||||
|
losetup -d '/dev/loop9'
|
||||||
|
rm '/swapfile'
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_root_pw () {
|
function set_root_pw () {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user