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

Merge pull request #1249 from tych0/first-moby-pr

Browse Source 
fix some shellcheck issues
This commit is contained in:
Justin Cormack 2017-03-06 21:56:38 +00:00 committed by GitHub
commit 1ced40db97
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/d4m.sh
View File

@ -11,17 +11,17 @@ DB_BRIDGE=com.docker.driver.amd64-linux/slirp/bridge-connections
# Check if VPNKit L2 bridge mode is enabled # Check if VPNKit L2 bridge mode is enabled
enable_bridge() { enable_bridge() {
(cd $DB && \ (cd "${DB}" && \
echo -n "1" > ${DB_BRIDGE} && \ echo -n "1" > ${DB_BRIDGE} && \
git add ${DB_BRIDGE} && \ git add ${DB_BRIDGE} && \
git commit -m "enable bridge" git commit -m "enable bridge"
) )
} }
(cd $DB; git reset --hard) (cd "${DB}"; git reset --hard)
if [ -f ${DB}/${DB_BRIDGE} ]; then if [ -f "${DB}/${DB_BRIDGE}" ]; then
content=$(cat ${DB}/${DB_BRIDGE}) content=$(cat "${DB}/${DB_BRIDGE}")
[ ${content} != "1" ] && enable_bridge [ "${content}" != "1" ] && enable_bridge
else else
enable_bridge enable_bridge
fi fi
@ -31,7 +31,7 @@ KERNEL="kernel/x86_64/vmlinuz64"
CMDLINE="earlyprintk=serial console=ttyS0" CMDLINE="earlyprintk=serial console=ttyS0"
DISK=$(mktemp disk.img.XXXX) DISK=$(mktemp disk.img.XXXX)
dd if=/dev/zero of=$DISK bs=1048576 count=256 dd if=/dev/zero of="$DISK" bs=1048576 count=256
MEM="-m 1G" MEM="-m 1G"
SMP="-c 1" SMP="-c 1"