File tree 2 files changed +4
-3
lines changed
2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -178,13 +178,13 @@ function install_additional_packages() {
178
178
shift
179
179
if [[ ${BASE_OS} = " fedora-coreos" ]]; then
180
180
${SSH} core@${vm_ip} -- ' sudo sed -i -z s/enabled=0/enabled=1/g /etc/yum.repos.d/centos.repo'
181
- ${SSH} core@${vm_ip} -- " sudo rpm-ostree install --allow-inactive $* "
181
+ ${SSH} core@${vm_ip} -- " sudo rpm-ostree install --allow-inactive $ADDITIONAL_PACKAGES "
182
182
${SSH} core@${vm_ip} -- ' sudo sed -i -z s/enabled=1/enabled=0/g /etc/yum.repos.d/centos.repo'
183
183
else
184
184
# Download the hyperV daemons dependency on host
185
185
local pkgDir=$( mktemp -d tmp-rpmXXX)
186
186
mkdir -p ${pkgDir} /packages
187
- sudo yum download --downloadonly --downloaddir ${pkgDir} /packages $* --resolve --alldeps
187
+ sudo yum download --downloadonly --downloaddir ${pkgDir} /packages ${ADDITIONAL_PACKAGES} --resolve --alldeps
188
188
189
189
# SCP the downloaded rpms to VM
190
190
${SCP} -r ${pkgDir} /packages core@${vm_ip} :/home/core/
@@ -203,7 +203,7 @@ function install_additional_packages() {
203
203
function prepare_hyperV() {
204
204
local vm_ip=$1
205
205
206
- install_additional_packages ${vm_ip} hyperv-daemons
206
+ ADDITIONAL_PACKAGES+= " hyperv-daemons"
207
207
208
208
# Adding Hyper-V vsock support
209
209
${SSH} core@${vm_ip} ' sudo bash -x -s' << EOF
Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ INSTALL_DIR=${1:-crc-tmp-install-data}
16
16
OPENSHIFT_VERSION=$( ${JQ} -r .clusterInfo.openshiftVersion $INSTALL_DIR /crc-bundle-info.json)
17
17
BASE_DOMAIN=$( ${JQ} -r .clusterInfo.baseDomain $INSTALL_DIR /crc-bundle-info.json)
18
18
BUNDLE_TYPE=$( ${JQ} -r .type $INSTALL_DIR /crc-bundle-info.json)
19
+ ADDITIONAL_PACKAGES=" "
19
20
20
21
case ${BUNDLE_TYPE} in
21
22
microshift)
You can’t perform that action at this time.
0 commit comments