diff options
| -rw-r--r-- | mcp/scripts/lib.sh | 1 | ||||
| -rw-r--r-- | mcp/scripts/lib_jump_deploy.sh | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 947361e29..79767f0fa 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -47,6 +47,7 @@ function cleanup_uefi { efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ rm -rf /boot/efi/*\"" || true + ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run 'shutdown now'" || true } function get_nova_compute_pillar_data { diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh index 561f2c44c..d8b62fd7c 100644 --- a/mcp/scripts/lib_jump_deploy.sh +++ b/mcp/scripts/lib_jump_deploy.sh @@ -48,17 +48,13 @@ function __kernel_modules { fi # Best-effort attempt at building a non-maintaned kernel module - local __baseurl - local __subdir + local __baseurl='http://vault.centos.org/centos' + local __subdir='Source/SPackages' local __uname_r=$(uname -r) local __uname_m=$(uname -m) if [ "${__uname_m}" = 'x86_64' ]; then - __baseurl='http://vault.centos.org/centos' - __subdir='Source/SPackages' __srpm="kernel-${__uname_r%.${__uname_m}}.src.rpm" else - __baseurl='http://vault.centos.org/altarch' - __subdir="Source/${__uname_m}/Source/SPackages" # NOTE: fmt varies across releases (e.g. kernel-alt-4.11.0-44.el7a.src.rpm) __srpm="kernel-alt-${__uname_r%.${__uname_m}}.src.rpm" fi |