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
f4f23af2
Commit
f4f23af2
authored
6 years ago
by
Henrik Riomar
Committed by
Natanael Copa
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
main/zfs: import pool before swap
Just like for lvm, we need to import the zfs pool before swap is started
parent
b67707fe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/zfs/APKBUILD
+6
-3
6 additions, 3 deletions
main/zfs/APKBUILD
main/zfs/zfs-import-should-be-before-swap.patch
+25
-0
25 additions, 0 deletions
main/zfs/zfs-import-should-be-before-swap.patch
with
31 additions
and
3 deletions
main/zfs/APKBUILD
+
6
−
3
View file @
f4f23af2
...
...
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
zfs
pkgver
=
0.7.12
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"ZFS for Linux"
url
=
"http://zfsonlinux.org"
arch
=
"all !armhf !armv7"
...
...
@@ -11,7 +11,9 @@ depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev attr-dev"
makedepends
=
"
$depends_dev
automake autoconf libtool linux-headers"
subpackages
=
"
$pkgname
-dev
$pkgname
-doc
$pkgname
-libs
$pkgname
-dracut::noarch
$pkgname
-udev
$pkgname
-scripts
$pkgname
-utils-py:utils_py:noarch"
source
=
"https://github.com/zfsonlinux/zfs/releases/download/zfs-
$pkgver
/zfs-
$pkgver
.tar.gz"
source
=
"https://github.com/zfsonlinux/zfs/releases/download/zfs-
$pkgver
/zfs-
$pkgver
.tar.gz
zfs-import-should-be-before-swap.patch
"
prepare
()
{
default_prepare
...
...
@@ -67,4 +69,5 @@ utils_py() {
done
}
sha512sums
=
"278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2 zfs-0.7.12.tar.gz"
sha512sums
=
"278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2 zfs-0.7.12.tar.gz
d1632b7c7cc3997bf9617ea95a7554220f1d9dc4a10ca461fdcee7b5452f0334a01aa90166e20b657f4a752637022d548d0372fbcb0756d838f146031a8eee74 zfs-import-should-be-before-swap.patch"
This diff is collapsed.
Click to expand it.
main/zfs/zfs-import-should-be-before-swap.patch
0 → 100644
+
25
−
0
View file @
f4f23af2
From 83f01e877fb6b77692c66cbd3f1c6c95217b721d Mon Sep 17 00:00:00 2001
From: Henrik Riomar <henrik.riomar@gmail.com>
Date: Wed, 13 Mar 2019 09:32:40 +0100
Subject: [PATCH] zfs-import: should be before swap
zfs-import must be done before swap in order for swap on zvol to work
---
etc/init.d/zfs-import.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
index fea661bbc..420d2e8a7 100644
--- a/etc/init.d/zfs-import.in
+++ b/etc/init.d/zfs-import.in
@@ -38,6 +38,7 @@
do_depend()
{
+ before swap
after sysfs udev
keyword -lxc -openvz -prefix -vserver
}
--
2.21.0
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