Skip to content

GitLab

alpine-conf
alpine-conf
Commit e60c5d7f authored by Natanael Copa's avatar Natanael Copa
Browse files
Options

setup-disk: only install MBR on native install 

we fix this by unsetting BOOTLOADER for all data only setups.
parent e15cae56
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
setup-disk.in
View file @ e60c5d7f
...@@ -649,7 +649,6 @@ setup_partitions() { ...@@ -649,7 +649,6 @@ setup_partitions() {
supported_part_label "$DISKLABEL" || return 1 supported_part_label "$DISKLABEL" || return 1
# initialize MBR for syslinux only # initialize MBR for syslinux only
# FIXME: this should only by run by native install
if [ "$BOOTLOADER" = "syslinux" ] && [ -f "$MBR" ]; then if [ "$BOOTLOADER" = "syslinux" ] && [ -f "$MBR" ]; then
cat "$MBR" > $diskdev cat "$MBR" > $diskdev
fi fi
...@@ -836,6 +835,7 @@ data_only_disk_install_lvm() { ...@@ -836,6 +835,7 @@ data_only_disk_install_lvm() {
local var_dev=/dev/$vgname/lv_var local var_dev=/dev/$vgname/lv_var
local lvm_part_type=$(partition_id lvm) local lvm_part_type=$(partition_id lvm)
local size= local size=
unset BOOTLOADER
init_progs || return 1 init_progs || return 1
confirm_erase $@ || return 1 confirm_erase $@ || return 1
...@@ -864,6 +864,7 @@ data_only_disk_install() { ...@@ -864,6 +864,7 @@ data_only_disk_install() {
local swap_part_type=$(partition_id swap) local swap_part_type=$(partition_id swap)
local size= local size=
local swap_dev= var_dev= local swap_dev= var_dev=
unset BOOTLOADER
init_progs || return 1 init_progs || return 1
confirm_erase $@ || return 1 confirm_erase $@ || return 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment