diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-24 14:25:39 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-24 12:34:43 +0000 |
commit | d02f973682b84a3e4a4859235bc4df88f3b1de74 (patch) | |
tree | 3c9dfe3fd76956e654897e1ea9c3e49ab326fb1f | |
parent | 5803f98263d7c663e32435751096ecda130d7d13 (diff) | |
download | alpine_aports-d02f973682b84a3e4a4859235bc4df88f3b1de74.tar.bz2 alpine_aports-d02f973682b84a3e4a4859235bc4df88f3b1de74.tar.xz alpine_aports-d02f973682b84a3e4a4859235bc4df88f3b1de74.zip |
main/alpine-conf: setup-disk: add swap to fstab
fixes #2249
(cherry picked from commit 7646ddf98d629ba695d3736014b5b45cc526b57a)
Conflicts:
main/alpine-conf/APKBUILD
-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 @@ | |||
1 | From e85487169a542eac82244b448e9bb4882ee7a4da Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu, 24 Oct 2013 14:21:23 +0200 | ||
4 | Subject: [PATCH] setup-disk: add swap to /etc/fstab | ||
5 | |||
6 | --- | ||
7 | setup-disk.in | 5 +++++ | ||
8 | 1 file changed, 5 insertions(+) | ||
9 | |||
10 | diff --git a/setup-disk.in b/setup-disk.in | ||
11 | index 8d3e14d..9e222fb 100644 | ||
12 | --- a/setup-disk.in | ||
13 | +++ b/setup-disk.in | ||
14 | @@ -286,6 +286,10 @@ install_mounted_root() { | ||
15 | mv "$mnt"/etc/fstab "$mnt"/etc/fstab.old | ||
16 | fi | ||
17 | enumerate_fstab "$mnt" >> "$mnt"/etc/fstab | ||
18 | + if [ -n "$SWAP_DEVICE" ]; then | ||
19 | + echo -e "${SWAP_DEVICE}\tswap\tswap\tdefaults\t0 0" \ | ||
20 | + >> "$mnt"/etc/fstab | ||
21 | + fi | ||
22 | cat >>"$mnt"/etc/fstab <<EOF | ||
23 | /dev/cdrom /media/cdrom iso9660 noauto,ro 0 0 | ||
24 | /dev/fd0 /media/floppy vfat noauto 0 0 | ||
25 | @@ -573,6 +577,7 @@ setup_swap_dev() { | ||
26 | mkswap $swap_dev >/dev/null | ||
27 | echo -e "$swap_dev\tswap\t\tswap\tdefaults 0 0" >> /etc/fstab | ||
28 | done | ||
29 | + SWAP_DEVICE="$(uuid_or_device $swap_dev)" | ||
30 | swapon -a | ||
31 | rc-update --quiet add swap boot | ||
32 | } | ||
33 | -- | ||
34 | 1.8.4.1 | ||
35 | |||
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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.12.0 | 3 | pkgver=2.12.0 |
4 | pkgrel=3 | 4 | pkgrel=4 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
@@ -9,6 +9,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.b | |||
9 | 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch | 9 | 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch |
10 | 0001-setup-interfaces-fix-vlan-raw-device.patch | 10 | 0001-setup-interfaces-fix-vlan-raw-device.patch |
11 | 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch | 11 | 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch |
12 | 0001-setup-disk-add-swap-to-etc-fstab.patch | ||
12 | " | 13 | " |
13 | 14 | ||
14 | arch="all" | 15 | arch="all" |
@@ -42,12 +43,15 @@ package() { | |||
42 | md5sums="4038a3be9a785ead649d913e208e2bd8 alpine-conf-2.12.0.tar.bz2 | 43 | md5sums="4038a3be9a785ead649d913e208e2bd8 alpine-conf-2.12.0.tar.bz2 |
43 | 1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch | 44 | 1f2ee5791a9bb40bd5e9862f60299ce2 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch |
44 | 8e528859d2ea4d24e2de9436c499a64d 0001-setup-interfaces-fix-vlan-raw-device.patch | 45 | 8e528859d2ea4d24e2de9436c499a64d 0001-setup-interfaces-fix-vlan-raw-device.patch |
45 | 5f8c8ef78f6ff53e4683a9daacf16355 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch" | 46 | 5f8c8ef78f6ff53e4683a9daacf16355 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch |
47 | ef759a251cd383dcb3b6b0b4cfb9bb0b 0001-setup-disk-add-swap-to-etc-fstab.patch" | ||
46 | sha256sums="d3f2a2e9a14ff2152731ed97aad9435da4be698b192400dc8dc942fc7830f0c4 alpine-conf-2.12.0.tar.bz2 | 48 | sha256sums="d3f2a2e9a14ff2152731ed97aad9435da4be698b192400dc8dc942fc7830f0c4 alpine-conf-2.12.0.tar.bz2 |
47 | 4e24ab7e3c0c851af03ea48016aeaa7e066962ceddc96cdc9cdd5566f25b2bfd 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch | 49 | 4e24ab7e3c0c851af03ea48016aeaa7e066962ceddc96cdc9cdd5566f25b2bfd 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch |
48 | 591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94 0001-setup-interfaces-fix-vlan-raw-device.patch | 50 | 591cb749663bf0c1b0caff12e5e340cb468257409580e56b0dbecf4abba2ed94 0001-setup-interfaces-fix-vlan-raw-device.patch |
49 | 3320a82abd79daa893a34cb9a235b27f539af12f8d32806b5630a7cef62d7aa6 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch" | 51 | 3320a82abd79daa893a34cb9a235b27f539af12f8d32806b5630a7cef62d7aa6 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch |
52 | 930b4f225a06f42f4fdd47d3d01470bfe90f1413b0e5ad05f514138ee8e99104 0001-setup-disk-add-swap-to-etc-fstab.patch" | ||
50 | sha512sums="93cc71a83d9e773b92a9993003c0b8b5ed98b5ee42db74c69cde635ca9230c59be0ce99588828729ec41c1a4262bbe9fdb60a81adf282c3f063ff916666e1140 alpine-conf-2.12.0.tar.bz2 | 53 | sha512sums="93cc71a83d9e773b92a9993003c0b8b5ed98b5ee42db74c69cde635ca9230c59be0ce99588828729ec41c1a4262bbe9fdb60a81adf282c3f063ff916666e1140 alpine-conf-2.12.0.tar.bz2 |
51 | 400b527ada2dff3662a55f6046a9e2ae762e91456574ee3cb665bc2c469e1c0f29b2d9f9c1ea2e4bdf5d02554f20df0a6ebe78b06e957cce17e21233fd08a097 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch | 54 | 400b527ada2dff3662a55f6046a9e2ae762e91456574ee3cb665bc2c469e1c0f29b2d9f9c1ea2e4bdf5d02554f20df0a6ebe78b06e957cce17e21233fd08a097 0001-setup-interfaces-fix-ip-can-t-find-device-eth1.3-mes.patch |
52 | 2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf 0001-setup-interfaces-fix-vlan-raw-device.patch | 55 | 2cb3c59f9edce7d4ebc821571314af41310ec94a543783ed67c738258434133d70be3cacc9d552e75381036ad014c2a38dec611101ce9d3649e326f120378cdf 0001-setup-interfaces-fix-vlan-raw-device.patch |
53 | 1dd5132cd0179083cf06c11e1a8513b6e49d1d75f0d14c0f402997641537c29afe3fb709910eb7b9b6ecb17a89fd77224d16dd1478725296f5bacfdcfff240fd 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch" | 56 | 1dd5132cd0179083cf06c11e1a8513b6e49d1d75f0d14c0f402997641537c29afe3fb709910eb7b9b6ecb17a89fd77224d16dd1478725296f5bacfdcfff240fd 0001-setup-disk-fix-running-update-extlinux-in-chroot.patch |
57 | 42909ca1429c1b9e9683af8374b6787190f55131ba65fcccad1012fa2e633d0724559caec1c8bef56fb820462b72c528d3f53f40dda82fa65e22d903d718259a 0001-setup-disk-add-swap-to-etc-fstab.patch" | ||