diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-24 14:25:39 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-24 14:26:43 +0200 |
| commit | 7646ddf98d629ba695d3736014b5b45cc526b57a (patch) | |
| tree | 4205b9a985c88dacad6c9b621138a66489f597cf /main/alpine-conf | |
| parent | c2c01c0d47d32e99583273d3cb2df0a7253358e9 (diff) | |
| download | aports-7646ddf98d629ba695d3736014b5b45cc526b57a.tar.bz2 aports-7646ddf98d629ba695d3736014b5b45cc526b57a.tar.xz | |
main/alpine-conf: setup-disk: add swap to fstab
ref #2249
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-add-swap-to-etc-fstab.patch | 35 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
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 65a5dc0e86..227fd8b8a6 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.13.0 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-setup-timezone-fix-bug-in-getopts-parsing.patch 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch + 0001-setup-disk-add-swap-to-etc-fstab.patch " arch="all" @@ -40,10 +41,13 @@ package() { } md5sums="29907dff864b4545e1fb5f49e08629bc alpine-conf-2.13.0.tar.xz 048af5408622f8d9fd1dcae5c48c0122 0001-setup-timezone-fix-bug-in-getopts-parsing.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="907c83a8fa1027e017fc84c7ff4bea62a41e7dcd2acd3ed7fa97ee1afc8a81ad alpine-conf-2.13.0.tar.xz 5e4dc989ab306444d470049a86225b976cdd73135bce805733c2218fd318029b 0001-setup-timezone-fix-bug-in-getopts-parsing.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="fb083d154cedbd9dfa5a2ab044e7ee29ecc58dfefe80bd3c1ca9eac9d080deece561cddea996278d7db42aae44fac4b00f19d32a23ec996fbf6a6c76b78b0e85 alpine-conf-2.13.0.tar.xz b437594aac79b3bd3a38bf43e7ade4b612cac4f09f0a2c9fa413ea21dea07fe575e24724e000586b596308bdd220afee93baeabcdbe3594c7ffa8f6d5efb83b1 0001-setup-timezone-fix-bug-in-getopts-parsing.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" |