diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-14 07:22:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-14 07:39:32 +0000 |
| commit | 3f422832e1e14a724e6c0c659ed9ab8609507f3c (patch) | |
| tree | 2c0ab17cd6fb44bb5c3d34347333d9f6406c67d5 /main/alpine-conf | |
| parent | 80c5136b033e3d28508e996d1e1ad224c9017639 (diff) | |
| download | aports-3f422832e1e14a724e6c0c659ed9ab8609507f3c.tar.bz2 aports-3f422832e1e14a724e6c0c659ed9ab8609507f3c.tar.xz | |
main/alpine-conf: fix btrfs root in setup-disk
ref #4445
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-fix-btrfs-root.patch | 31 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 39 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-fix-btrfs-root.patch b/main/alpine-conf/0001-setup-disk-fix-btrfs-root.patch new file mode 100644 index 0000000000..7e54e7e820 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-fix-btrfs-root.patch @@ -0,0 +1,31 @@ +From dffde463b05beb124816357fd6ff24423b0e79f0 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 14 Jul 2015 07:21:07 +0000 +Subject: [PATCH] setup-disk: fix btrfs root + +fix typo in btrfs-progs. add kernel module eary so /dev/btrfs-control is +created. + +ref #4445 +--- + setup-disk.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index e2798f9..55b6dcb 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -441,7 +441,9 @@ init_progs() { + case $ROOTFS in + ext*) fstools=e2fsprogs; mkfs_args="-q";; + xfs) fstools=xfsprogs; mkfs_args="-q";; +- btrfs) fstools=btrs-progs; mkfs_args="";; ++ # we need load btrfs module early to avoid the error message: ++ # 'failed to open /dev/btrfs-control' ++ btrfs) fstools=btrfs-progs; mkfs_args=""; modprobe btrfs;; + esac + apk add --quiet sfdisk e2fsprogs lvm2 $raidpkg syslinux $fstools $@ + } +-- +2.4.5 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index e8d2249b78..9269dba537 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -10,6 +10,7 @@ depends="openrc>0.13" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch + 0001-setup-disk-fix-btrfs-root.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -38,10 +39,13 @@ package() { md5sums="d8863487539eb41de219303addf71aa1 alpine-conf-3.2.1.tar.xz f1439adcfc377c56b987b379b725f0af 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch -f2da5b6cf6e4f1c1d24b59210b172bd8 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch" +f2da5b6cf6e4f1c1d24b59210b172bd8 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch +bb1acd69593e19a9ab686cf6b790bbdb 0001-setup-disk-fix-btrfs-root.patch" sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d alpine-conf-3.2.1.tar.xz e30d5fc4c1ae6af9673c543427561d027792c1bb26e3901ce954d15689dc66e9 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch -6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch" +6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch +1ec287f5ec4ca94af1b02067eb3a785e527a7658ed737b28e5f39c437db66625 0001-setup-disk-fix-btrfs-root.patch" sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8 alpine-conf-3.2.1.tar.xz 135bd0a0638f14a90d896c31de09eb3aa08cd7b2b1452fa20fdf12d128282c5c9eee5c1d76f7d8b62714f15395f225bf61c9968ad04ff164e64e8924c89abbd6 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch -cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch" +cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch +0d7e6ce26798ab42bf1e2cbda6421e811e949d427e1ff69210abd950686f5ff0a5d61404db9de160268ae976e768aba74f51814b8a9b6e318c32563f924a3965 0001-setup-disk-fix-btrfs-root.patch" |