Commit 0dd1f108 authored by Natanael Copa's avatar Natanael Copa

setup-disk: don't install syslinux for data-only

parent d3dbd553
...@@ -458,7 +458,7 @@ init_progs() { ...@@ -458,7 +458,7 @@ init_progs() {
btrfs) fstools="$fstools btrfs-progs";; btrfs) fstools="$fstools btrfs-progs";;
esac esac
done done
apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@ apk add --quiet sfdisk $lvmpkg $raidpkg $fstools $@
} }
show_disk_info() { show_disk_info() {
...@@ -505,7 +505,9 @@ setup_partitions() { ...@@ -505,7 +505,9 @@ setup_partitions() {
echo "w" | fdisk $diskdev >/dev/null echo "w" | fdisk $diskdev >/dev/null
# fix the MBR while here so extlinux can boot # fix the MBR while here so extlinux can boot
cat "$MBR" > $diskdev if [ -f "$MBR" ]; then
cat "$MBR" > $diskdev
fi
local start=1M local start=1M
local line= local line=
...@@ -771,7 +773,7 @@ native_disk_install_lvm() { ...@@ -771,7 +773,7 @@ native_disk_install_lvm() {
local lvm_size= local lvm_size=
local root_dev=/dev/$vgname/lv_root local root_dev=/dev/$vgname/lv_root
init_progs || return 1 init_progs syslinux || return 1
confirm_erase $@ || return 1 confirm_erase $@ || return 1
if [ -n "$USE_RAID" ]; then if [ -n "$USE_RAID" ]; then
...@@ -802,7 +804,7 @@ native_disk_install() { ...@@ -802,7 +804,7 @@ native_disk_install() {
local root_size= local root_size=
local root_dev= boot_dev= swap_dev= local root_dev= boot_dev= swap_dev=
init_progs || return 1 init_progs syslinux || return 1
confirm_erase $@ || return 1 confirm_erase $@ || return 1
if [ -n "$USE_RAID" ]; then if [ -n "$USE_RAID" ]; then
......
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