1
0
mirror of https://github.com/rancher/os.git synced 2025-07-20 01:49:04 +00:00

Merge pull request #845 from datawolf/fix-suffix-error

fix the suffix error when the target is rootfs
This commit is contained in:
Darren Shepherd 2016-03-31 18:33:10 -07:00
commit 0fcc1bb94f

View File

@ -48,7 +48,7 @@ docker export ${DFS_ARCH} | tar xvf - -C ${INITRD_DIR} --exclude=usr/bin/dockerl
usr usr
if [ "$IS_ROOTFS" == "1" ]; then if [ "$IS_ROOTFS" == "1" ]; then
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}) DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX})
trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT trap "docker rm -fv ${DFS_ARCH} ${DFS}" EXIT
docker exec -i ${DFS} docker load < ${BUILD}/images.tar docker exec -i ${DFS} docker load < ${BUILD}/images.tar
docker stop ${DFS} docker stop ${DFS}