util, util-iso-boot: clean up code

This commit is contained in:
udeved 2017-02-27 21:49:19 +01:00
parent d75095f3e6
commit 8e965dd3d2
2 changed files with 2 additions and 13 deletions

View file

@ -21,17 +21,11 @@ set_mkinicpio_hooks(){
fi
}
gen_boot_args(){
local args=(quiet)
echo ${args[@]}
}
prepare_initcpio(){
msg2 "Copying initcpio ..."
cp /etc/initcpio/hooks/miso* $1/etc/initcpio/hooks
cp /etc/initcpio/install/miso* $1/etc/initcpio/install
cp /etc/initcpio/miso_shutdown $1/etc/initcpio
# sed -e "s|/usr/lib/initcpio/|/etc/initcpio/|" -i $1/etc/initcpio/install/miso_shutdown
}
prepare_initramfs(){
@ -79,7 +73,7 @@ vars_to_boot_conf(){
-e "s|@ARCH@|${target_arch}|g" \
-e "s|@DRV@|$2|g" \
-e "s|@SWITCH@|$3|g" \
-e "s|@BOOT_ARGS@|$(gen_boot_args)|g" \
-e "s|@BOOT_ARGS@||g" \
-i $1
}

View file

@ -393,11 +393,6 @@ check_profile_vars(){
fi
}
get_svc(){
local service=${displaymanager}
echo $service
}
load_profile_config(){
[[ -f $1 ]] || return 1
@ -453,7 +448,7 @@ load_profile_config(){
if [[ ${displaymanager} != "none" ]]; then
enable_openrc+=('xdm')
enable_systemd+=("$(get_svc)")
enable_systemd+=("${displaymanager}")
fi
[[ -z ${netinstall} ]] && netinstall='false'