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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Dominika Liberda
aports
Commits
762ae2ca
Commit
762ae2ca
authored
6 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
main/alpine-conf: upgrade to 3.8.1
parent
1912c8b6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/alpine-conf/APKBUILD
+4
-7
4 additions, 7 deletions
main/alpine-conf/APKBUILD
main/alpine-conf/grub.patch
+0
-29
0 additions, 29 deletions
main/alpine-conf/grub.patch
with
4 additions
and
36 deletions
main/alpine-conf/APKBUILD
+
4
−
7
View file @
762ae2ca
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
alpine-conf
pkgver
=
3.8.
0
pkgrel
=
1
pkgver
=
3.8.
1
pkgrel
=
0
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
"
source
=
"https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-
$pkgver
.tar.xz"
builddir
=
"
$srcdir
"
/
$pkgname
-
$pkgver
build
()
{
...
...
@@ -25,5 +23,4 @@ package() {
done
}
sha512sums
=
"402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d alpine-conf-3.8.0.tar.xz
d1080c84499bcf2f14131899aa57680b64cfe256d390faf5ce1ad1d2a32768ba32a721b0177962b74eb9887e555ceeb9197022a33bac7b3ecc8eca1ffea9c2f4 grub.patch"
sha512sums
=
"6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz"
This diff is collapsed.
Click to expand it.
main/alpine-conf/grub.patch
deleted
100644 → 0
+
0
−
29
View file @
1912c8b6
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