diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-23 12:26:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-23 12:26:08 +0000 |
| commit | e60c5d7f33b4d40b4ecf6e198484141e13d20f24 (patch) | |
| tree | fb8741f6057eab4beb791b7c162ad6a02420feb8 | |
| parent | e15cae56bfadfb7440186c515c86bae0a83bacb0 (diff) | |
| download | alpine-conf-e60c5d7f33b4d40b4ecf6e198484141e13d20f24.tar.bz2 alpine-conf-e60c5d7f33b4d40b4ecf6e198484141e13d20f24.tar.xz | |
setup-disk: only install MBR on native install
we fix this by unsetting BOOTLOADER for all data only setups.
| -rw-r--r-- | setup-disk.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setup-disk.in b/setup-disk.in index 1fe0f91..7e14c09 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -649,7 +649,6 @@ setup_partitions() { supported_part_label "$DISKLABEL" || return 1 # initialize MBR for syslinux only - # FIXME: this should only by run by native install if [ "$BOOTLOADER" = "syslinux" ] && [ -f "$MBR" ]; then cat "$MBR" > $diskdev fi @@ -836,6 +835,7 @@ data_only_disk_install_lvm() { local var_dev=/dev/$vgname/lv_var local lvm_part_type=$(partition_id lvm) local size= + unset BOOTLOADER init_progs || return 1 confirm_erase $@ || return 1 @@ -864,6 +864,7 @@ data_only_disk_install() { local swap_part_type=$(partition_id swap) local size= local swap_dev= var_dev= + unset BOOTLOADER init_progs || return 1 confirm_erase $@ || return 1 |