Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
alpine
alpine-conf
Commits
0dd1f108
Commit
0dd1f108
authored
May 20, 2016
by
Natanael Copa
Browse files
setup-disk: don't install syslinux for data-only
parent
d3dbd553
Changes
1
Hide whitespace changes
Inline
Side-by-side
setup-disk.in
View file @
0dd1f108
...
...
@@ -458,7 +458,7 @@ init_progs() {
btrfs
)
fstools
=
"
$fstools
btrfs-progs"
;;
esac
done
apk add
--quiet
sfdisk
$lvmpkg
$raidpkg
syslinux
$fstools
$@
apk add
--quiet
sfdisk
$lvmpkg
$raidpkg
$fstools
$@
}
show_disk_info
()
{
...
...
@@ -505,7 +505,9 @@ setup_partitions() {
echo
"w"
| fdisk
$diskdev
>
/dev/null
# fix the MBR while here so extlinux can boot
cat
"
$MBR
"
>
$diskdev
if
[
-f
"
$MBR
"
]
;
then
cat
"
$MBR
"
>
$diskdev
fi
local
start
=
1M
local
line
=
...
...
@@ -771,7 +773,7 @@ native_disk_install_lvm() {
local
lvm_size
=
local
root_dev
=
/dev/
$vgname
/lv_root
init_progs
||
return
1
init_progs
syslinux
||
return
1
confirm_erase
$@
||
return
1
if
[
-n
"
$USE_RAID
"
]
;
then
...
...
@@ -802,7 +804,7 @@ native_disk_install() {
local
root_size
=
local
root_dev
=
boot_dev
=
swap_dev
=
init_progs
||
return
1
init_progs
syslinux
||
return
1
confirm_erase
$@
||
return
1
if
[
-n
"
$USE_RAID
"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment