github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1736 from deitch/fix-swap-example

Browse Source 
use updated kernel and correct path in examples/swap.yml
This commit is contained in:
Justin Cormack 2017-04-29 20:56:54 +01:00 committed by GitHub
commit 805be09669
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/swap.yml
View File

@ -48,7 +48,7 @@ onboot:
rootfsPropagation: shared rootfsPropagation: shared
command: ["/mount.sh", "/var/external"] command: ["/mount.sh", "/var/external"]
- name: swap - name: swap
image: "linuxkit/swap:edd74ce7ced2b97dba5075012f497570c5490299" image: "linuxkit/swap:d089b31acad8a5f6a5f1c368ddd1dfe1d049b100"
net: host net: host
pid: host pid: host
capabilities: capabilities:
@ -57,7 +57,7 @@ onboot:
binds: binds:
- /var:/var - /var:/var
- /dev:/dev - /dev:/dev
command: ["swap.sh", "--path", "/var/external/swap", "--size","1G"] command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"]
services: services:
- name: rngd - name: rngd
image: "linuxkit/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" image: "linuxkit/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"

6
pkg/swap/swap.sh
View File

@ -2,7 +2,7 @@
set -e set -e
while [ $# -gt 1 ]; do while [ $# -ge 1 ]; do
key="$1" key="$1"
case $key in case $key in
@ -74,7 +74,9 @@ fi
## check each of our conditions ## check each of our conditions
for cond in $CONDITIONS; do for cond in $CONDITIONS; do
# split the condition parts # split the condition parts
IFS=: read condtype arg1 arg2 arg3 arg4 <<< "$cond" IFS=: read condtype arg1 arg2 arg3 arg4 <<EOF
$cond
EOF
case $condtype in case $condtype in
part) part)
partition=$arg1 partition=$arg1