Commit 122ec5b9 authored by Natanael Copa's avatar Natanael Copa

main/alpine-conf: upgrade to 3.6.0_rc2

parent 7569d2dc
From c15da3bf6ba6d7b05cac6c6182efdd4149554b82 Mon Sep 17 00:00:00 2001
From: Jakub Skrzypnik <j.skrzypnik@openmailbox.orxg>
Date: Fri, 6 Jan 2017 08:47:02 +0100
Subject: [PATCH] setup-disk: add xfs support as boot_fs
---
setup-disk.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup-disk.in b/setup-disk.in
index 023974e..c4103e4 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -141,7 +141,7 @@ find_mount_dev() {
}
supported_boot_fs() {
- local supported="ext2 ext3 ext4 btrfs"
+ local supported="ext2 ext3 ext4 btrfs xfs"
local fs=
for fs in $supported; do
[ "$fs" = "$1" ] && return 0
@@ -941,7 +941,7 @@ usage() {
If BOOTFS, ROOTFS, VARFS are specified, then format a partition with specified
filesystem. If not specified, the default filesystem is ext4.
Supported filesystems for
- boot: ext2, ext3, ext4, btrfs
+ boot: ext2, ext3, ext4, btrfs, xfs
root: ext2, ext3, ext4, btrfs, xfs
var: ext2, ext3, ext4, btrfs, xfs
__EOF__
--
2.13.0
From be87a08bc2200b80c068347568bea07a4fa09fb7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 19 May 2017 14:39:35 +0200
Subject: [PATCH] setup-keymap: allow specify the variant together with layout
Some users may know exactly which variant they want, and instead of
asking them two questions, we accept if users types in the variant at
the first question.
if the variant does not exist, then user is prompted.
---
setup-keymap.in | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/setup-keymap.in b/setup-keymap.in
index 67f89cb..ebcd29c 100644
--- a/setup-keymap.in
+++ b/setup-keymap.in
@@ -38,7 +38,13 @@ select_layout() {
default_read layout "$layout"
if [ "$layout" = "abort" ] || [ "$layout" = "none" ] ; then
goodbye 0
- elif [ -d "$MAPDIR/$layout" ] ; then
+ fi
+ set -- $layout
+ if [ $# -eq 2 ]; then
+ layout="$1"
+ variant="$2"
+ fi
+ if [ -d "$MAPDIR/$layout" ] ; then
return 0
fi
done
--
2.13.0
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.6.0_rc1
pkgrel=2
pkgver=3.6.0_rc2
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
license="MIT"
depends="openrc>0.13 busybox>=1.26.1-r3"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-setup-keymap-allow-specify-the-variant-together-with.patch
0001-setup-disk-add-xfs-support-as-boot_fs.patch
"
builddir="$srcdir"/$pkgname-$pkgver
......@@ -26,6 +24,4 @@ package() {
done
}
sha512sums="3d1b7c18a406791948485cd871942b94a0f2eadd6f1f0e9c87f92fb15750b9b41ffec0d7d2d16361a1e25f029765005e72b266ce48609ea0b7c5e5c99606d04f alpine-conf-3.6.0_rc1.tar.xz
67a1d72e45ba74d710a841c0a2671f74f792f6649fb530f86763fe2f10fc0005c644dfdcec25b00bc5eb0b97b2418775e95202269ef3b3f56b6c22044630fb86 0001-setup-keymap-allow-specify-the-variant-together-with.patch
fee1cb10a077ea7b5c01dc6367bc929d6c2eecf257848263435b5c9c130f6fb552f39809ea6403232d2f8ecea4b14b29a725a694228878ee0b1bb7ead696071b 0001-setup-disk-add-xfs-support-as-boot_fs.patch"
sha512sums="1f78f8d532e2713f93ca47377ff195b78bf90d22b290f8460a413ff912bd1283307dc2366624612aac588318d8227fdf1d1a3e89f760455f02f4cec4982188f4 alpine-conf-3.6.0_rc2.tar.xz"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment