Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
1954055e
Commit
1954055e
authored
6 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
main/alpine-conf: backport grub fix for setup-disk
let grub trigger generage grub.cfg in setup-disk
parent
fadee571
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/alpine-conf/APKBUILD
+4
-2
4 additions, 2 deletions
main/alpine-conf/APKBUILD
main/alpine-conf/grub.patch
+29
-0
29 additions, 0 deletions
main/alpine-conf/grub.patch
with
33 additions
and
2 deletions
main/alpine-conf/APKBUILD
+
4
−
2
View file @
1954055e
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
alpine-conf
pkgver
=
3.8.0
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"Alpine configuration management scripts"
url
=
http://git.alpinelinux.org/cgit/
$pkgname
arch
=
"all"
license
=
"MIT"
depends
=
"openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source
=
"https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-
$pkgver
.tar.xz
grub.patch
"
builddir
=
"
$srcdir
"
/
$pkgname
-
$pkgver
...
...
@@ -24,4 +25,5 @@ package() {
done
}
sha512sums
=
"402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d alpine-conf-3.8.0.tar.xz"
sha512sums
=
"402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d alpine-conf-3.8.0.tar.xz
d1080c84499bcf2f14131899aa57680b64cfe256d390faf5ce1ad1d2a32768ba32a721b0177962b74eb9887e555ceeb9197022a33bac7b3ecc8eca1ffea9c2f4 grub.patch"
This diff is collapsed.
Click to expand it.
main/alpine-conf/grub.patch
0 → 100644
+
29
−
0
View file @
1954055e
diff --git a/setup-disk.in b/setup-disk.in
index 4ed0cbd..5eb8638 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -306,16 +306,14 @@
setup_grub() {
esac
fi
- # setup GRUB config
-
- # all_video is needed to remove the video error on boot
- cat > "$mnt"/boot/grub/grub.cfg <<- EOF
- set timeout=2
- insmod all_video
- menuentry "Alpine Linux" {
- linux /boot/vmlinuz-$KERNEL_FLAVOR modules=$modules root=$root $kernel_opts
- initrd /boot/initramfs-$KERNEL_FLAVOR
- }
+ # setup GRUB config. trigger will generate final grub.cfg
+ install -d "$mnt"/etc/default/
+ cat > "$mnt"/etc/default/grub <<- EOF
+ GRUB_DISTRIBUTOR="Alpine"
+ GRUB_TIMEOUT=2
+ GRUB_DISABLE_SUBMENU=y
+ GRUB_DISABLE_RECOVERY=true
+ GRUB_CMDLINE_LINUX_DEFAULT="modules=$modules $kernel_opts"
EOF
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment