diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2020-01-13 12:43:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-13 12:43:37 +0000 |
| commit | 6da2c5d9fb43c15e0270880c88afc2061b284820 (patch) | |
| tree | c3e28dd2cd07e2d681d9a075c313b310dfaa13fe /mcp/scripts/lib_jump_deploy.sh | |
| parent | 02bdeb694ed12a2b17232818cc8dbfb98559ef21 (diff) | |
| parent | 181d6ccbb8f7fdfa46cb2bacb599406bb810f1c0 (diff) | |
Merge "baremetal, virtual: Bump kernel to hwe-18.04 (5.0)" into stable/iruya
Diffstat (limited to 'mcp/scripts/lib_jump_deploy.sh')
| -rw-r--r-- | mcp/scripts/lib_jump_deploy.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh index 532508a58..3dc3c4436 100644 --- a/mcp/scripts/lib_jump_deploy.sh +++ b/mcp/scripts/lib_jump_deploy.sh @@ -124,11 +124,15 @@ function __mount_image { sudo kpartx -av "${OPNFV_NBD_DEV}" # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image sudo partx -uvn 1:1 "${OPNFV_NBD_DEV}" - if [[ "${MCP_OS:-}" =~ ubuntu1604 ]] && sudo growpart "${OPNFV_NBD_DEV}" 1 + if [[ "${MCP_OS:-}" =~ ubuntu ]] && sudo growpart "${OPNFV_NBD_DEV}" 1 then + if [ -e "${image_dir}/e2fsprogs" ]; then + E2FSCK_PREFIX="${image_dir}/e2fsprogs/e2fsck/" + RESIZE_PREFIX="${image_dir}/e2fsprogs/resize/" + fi sudo kpartx -u "${OPNFV_NBD_DEV}" - sudo e2fsck -pf "${OPNFV_MAP_DEV}" - sudo resize2fs "${OPNFV_MAP_DEV}" + sudo "${E2FSCK_PREFIX}e2fsck" -pf "${OPNFV_MAP_DEV}" + sudo "${RESIZE_PREFIX}resize2fs" "${OPNFV_MAP_DEV}" else sleep 5 # /dev/nbdNp1 takes some time to come up fi |