diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-05-29 09:55:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-05-29 09:55:21 +0000 |
| commit | 3a24f89c2275eaf29b128e976d4daacd55134572 (patch) | |
| tree | 5e5134a15be33638dc08d8d49e041d93db340fd0 | |
| parent | 66e0b4930e8ea9c1a874e56b98b3b120ab52cab7 (diff) | |
| parent | 43e4d0b3d7441611a58ba89dfa3ae69269c16e52 (diff) | |
| download | alpine-conf-3a24f89c2275eaf29b128e976d4daacd55134572.zip | |
Merge branch 'patch-1' into 'master'
setup-disk: don't add syslinux package for mounted root install unless requested
Closes #10455
See merge request alpine/alpine-conf!5
| -rw-r--r-- | setup-disk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup-disk.in b/setup-disk.in index 7a3a2a3..86136de 100644 --- a/setup-disk.in +++ b/setup-disk.in @@ -1212,7 +1212,7 @@ shift $(( $OPTIND - 1)) if [ -d "$1" ]; then # install to given mounted root - apk add --quiet syslinux + [ "$BOOTLOADER" = "syslinux" ] && apk add --quiet syslinux install_mounted_root "${1%/}" \ && echo "You might need fix the MBR to be able to boot" >&2 exit $? |