buildiso: #162 put kernel checks in tight place
This commit is contained in:
parent
87e0f9c65b
commit
be1241dede
3 changed files with 13 additions and 26 deletions
|
@ -533,6 +533,18 @@ check_requirements(){
|
|||
if ! $(is_valid_branch ${branch});then
|
||||
die "%s is not a valid branch!" "${branch}"
|
||||
fi
|
||||
|
||||
local iso_kernel=${kernel:5:1} host_kernel=$(uname -r)
|
||||
|
||||
if [[ ${iso_kernel} < "4" ]] || [[ ${host_kernel%%*.} < "4" ]];then
|
||||
use_overlayfs='false'
|
||||
fi
|
||||
|
||||
if ${use_overlayfs};then
|
||||
iso_fs="overlayfs"
|
||||
else
|
||||
iso_fs="aufs"
|
||||
fi
|
||||
}
|
||||
|
||||
check_profile_vars(){
|
||||
|
|
25
lib/util.sh
25
lib/util.sh
|
@ -191,18 +191,6 @@ init_buildiso(){
|
|||
|
||||
[[ -z ${use_overlayfs} ]] && use_overlayfs='true'
|
||||
|
||||
local iso_kernel=${kernel:5:1}
|
||||
[[ ${iso_kernel} < "4" ]] && use_overlayfs='false'
|
||||
|
||||
if ${use_overlayfs};then
|
||||
iso_fs="overlayfs"
|
||||
else
|
||||
iso_fs="aufs"
|
||||
fi
|
||||
|
||||
local host_kernel=$(uname -r)
|
||||
[[ ${host_kernel%%*.} < "4" ]] && use_overlayfs='false'
|
||||
|
||||
[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
|
||||
}
|
||||
|
||||
|
@ -241,7 +229,6 @@ load_config(){
|
|||
}
|
||||
|
||||
unset_profile(){
|
||||
#unset initsys
|
||||
unset displaymanager
|
||||
unset autologin
|
||||
unset multilib
|
||||
|
@ -250,7 +237,6 @@ unset_profile(){
|
|||
unset nonfree_xorg
|
||||
unset default_desktop_executable
|
||||
unset default_desktop_file
|
||||
#unset kernel
|
||||
unset efi_boot_loader
|
||||
unset efi_part_size
|
||||
unset hostname
|
||||
|
@ -293,17 +279,6 @@ load_profile_config(){
|
|||
|
||||
[[ -z ${default_desktop_file} ]] && default_desktop_file="none"
|
||||
|
||||
# [[ -z ${kernel} ]] && kernel="linux44"
|
||||
#
|
||||
# local used_kernel=${kernel:5:1}
|
||||
# [[ ${used_kernel} < "4" ]] && use_overlayfs='false'
|
||||
#
|
||||
# if ${use_overlayfs};then
|
||||
# iso_fs="overlayfs"
|
||||
# else
|
||||
# iso_fs="aufs"
|
||||
# fi
|
||||
|
||||
[[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub"
|
||||
|
||||
[[ -z ${efi_part_size} ]] && efi_part_size="32M"
|
||||
|
|
Loading…
Reference in a new issue