main/alpine-conf: setup-disk: add swap to fstab

fixes #2249
(cherry picked from commit 7646ddf98d629ba695d3736014b5b45cc526b57a)

Conflicts:
	main/alpine-conf/APKBUILD

2 files changed, 43 insertions, 4 deletions

diff --git a/main/alpine-conf/0001-setup-disk-add-swap-to-etc-fstab.patch b/main/alpine-conf/0001-setup-disk-add-swap-to-etc-fstab.patch
new file mode 100644
index 0000000000..da41a090ab
--- /dev/null
+++ b/main/alpine-conf/0001-setup-disk-add-swap-to-etc-fstab.patch
@@ -0,0 +1,35 @@
+From e85487169a542eac82244b448e9bb4882ee7a4da Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 24 Oct 2013 14:21:23 +0200
+Subject: [PATCH] setup-disk: add swap to /etc/fstab
+
+---
+ setup-disk.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index 8d3e14d..9e222fb 100644
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -286,6 +286,10 @@ install_mounted_root() {
+                mv "$mnt"/etc/fstab "$mnt"/etc/fstab.old
+        fi
+        enumerate_fstab "$mnt" >> "$mnt"/etc/fstab
++       if [ -n "$SWAP_DEVICE" ]; then
++               echo -e "${SWAP_DEVICE}\tswap\tswap\tdefaults\t0 0" \
++                       >> "$mnt"/etc/fstab
++       fi
+        cat >>"$mnt"/etc/fstab <<EOF
+ /dev/cdrom     /media/cdrom    iso9660 noauto,ro 0 0
+ /dev/fd0       /media/floppy   vfat    noauto  0 0
+@@ -573,6 +577,7 @@ setup_swap_dev() {
+                mkswap $swap_dev >/dev/null
+                echo -e "$swap_dev\tswap\t\tswap\tdefaults 0 0" >> /etc/fstab
+        done
++       SWAP_DEVICE="$(uuid_or_device $swap_dev)"
+        swapon -a
+        rc-update --quiet add swap boot
+ }
+-- 
+1.8.4.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index f4cf396317..375d528811 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=2.12.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
@@ -9,6 +9,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.b
         0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
         0001-setup-interfaces-fix-vlan-raw-device.patch
         0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
+        0001-setup-disk-add-swap-to-etc-fstab.patch
         "
 
 arch="all"
@@ -42,12 +43,15 @@ package() {
 md5sums="4038a3be9a785ead649d913e208e2bd8  alpine-conf-2.12.0.tar.bz2
 1f2ee5791a9bb40bd5e9862f60299ce2  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
 8e528859d2ea4d24e2de9436c499a64d  0001-setup-interfaces-fix-vlan-raw-device.patch
-5f8c8ef78f6ff53e4683a9daacf16355  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"
+5f8c8ef78f6ff53e4683a9daacf16355  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
+ef759a251cd383dcb3b6b0b4cfb9bb0b  0001-setup-disk-add-swap-to-etc-fstab.patch"
 sha256sums="d3f2a2e9a14ff2152731ed97aad9435da4be698b192400dc8dc942fc7830f0c4  alpine-conf-2.12.0.tar.bz2
 4e24ab7e3c0c851af03ea48016aeaa7e066962ceddc96cdc9cdd5566f25b2bfd  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
 591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94  0001-setup-interfaces-fix-vlan-raw-device.patch
-3320a82abd79daa893a34cb9a235b27f539af12f8d32806b5630a7cef62d7aa6  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"
+3320a82abd79daa893a34cb9a235b27f539af12f8d32806b5630a7cef62d7aa6  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
+930b4f225a06f42f4fdd47d3d01470bfe90f1413b0e5ad05f514138ee8e99104  0001-setup-disk-add-swap-to-etc-fstab.patch"
 sha512sums="93cc71a83d9e773b92a9993003c0b8b5ed98b5ee42db74c69cde635ca9230c59be0ce99588828729ec41c1a4262bbe9fdb60a81adf282c3f063ff916666e1140  alpine-conf-2.12.0.tar.bz2
 400b527ada2dff3662a55f6046a9e2ae762e91456574ee3cb665bc2c469e1c0f29b2d9f9c1ea2e4bdf5d02554f20df0a6ebe78b06e957cce17e21233fd08a097  0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch
 2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf  0001-setup-interfaces-fix-vlan-raw-device.patch
-1dd5132cd0179083cf06c11e1a8513b6e49d1d75f0d14c0f402997641537c29afe3fb709910eb7b9b6ecb17a89fd77224d16dd1478725296f5bacfdcfff240fd  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch"
+1dd5132cd0179083cf06c11e1a8513b6e49d1d75f0d14c0f402997641537c29afe3fb709910eb7b9b6ecb17a89fd77224d16dd1478725296f5bacfdcfff240fd  0001-setup-disk-fix-running-update-extlinux-in-chroot.patch
+42909ca1429c1b9e9683af8374b6787190f55131ba65fcccad1012fa2e633d0724559caec1c8bef56fb820462b72c528d3f53f40dda82fa65e22d903d718259a  0001-setup-disk-add-swap-to-etc-fstab.patch"