Skip to content

Commit 5788468

Browse files
committed
osbuild: clean up unused variables
Should have been done as part of a876a9b.
1 parent 96e8851 commit 5788468

7 files changed

+0
-22
lines changed

src/cmd-osbuild

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ container-imgref: "${container_imgref}"
225225
deploy-via-container: "${deploy_via_container}"
226226
osname: "${name}"
227227
ostree-container: "${ostree_container}"
228-
ostree-ref: "${ref}"
229228
extra-kargs-string: "${extra_kargs}"
230-
ostree-repo: "${ostree_repo}"
231229
metal-image-size: "${metal_image_size_mb}"
232230
cloud-image-size: "${cloud_image_size_mb}"
233231
# Note: this is only used in the secex case; there, the rootfs is

src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '2'
22
mpp-vars:
33
artifact_name_prefix: $artifact_name_prefix
4-
ostree_repo: $ostree_repo
5-
ostree_ref: $ostree_ref
64
ociarchive: $ociarchive
75
osname: $osname
86
container_imgref: $container_imgref

src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '2'
22
mpp-vars:
33
artifact_name_prefix: $artifact_name_prefix
4-
ostree_repo: $ostree_repo
5-
ostree_ref: $ostree_ref
64
ociarchive: $ociarchive
75
osname: $osname
86
container_imgref: $container_imgref

src/osbuild-manifests/coreos.osbuild.riscv64.mpp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '2'
22
mpp-vars:
33
artifact_name_prefix: $artifact_name_prefix
4-
ostree_repo: $ostree_repo
5-
ostree_ref: $ostree_ref
64
ociarchive: $ociarchive
75
osname: $osname
86
container_imgref: $container_imgref

src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '2'
22
mpp-vars:
33
artifact_name_prefix: $artifact_name_prefix
4-
ostree_repo: $ostree_repo
5-
ostree_ref: $ostree_ref
64
ociarchive: $ociarchive
75
osname: $osname
86
container_imgref: $container_imgref

src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '2'
22
mpp-vars:
33
artifact_name_prefix: $artifact_name_prefix
4-
ostree_repo: $ostree_repo
5-
ostree_ref: $ostree_ref
64
ociarchive: $ociarchive
75
osname: $osname
86
container_imgref: $container_imgref

src/runvm-osbuild

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@ container_imgref=$(getconfig "container-imgref")
7171
container_repo=$(getconfig_def "container-repo" "")
7272
container_tag=$(getconfig_def "container-tag" "")
7373
extra_kargs=$(getconfig "extra-kargs-string" "")
74-
# If we are not deploying via container let's go ahead and
75-
# set the OSTree repo and ref information
76-
ostree_ref=""
77-
ostree_repo=""
78-
if [ -z "${deploy_via_container}" ]; then
79-
ostree_ref=$(getconfig "ostree-ref")
80-
ostree_repo="file://$(getconfig "ostree-repo")"
81-
fi
8274

8375
# Since it doesn't exist create loop-control
8476
[ ! -e /dev/loop-control ] && mknod /dev/loop-control c 10 237
@@ -111,8 +103,6 @@ set -x; osbuild-mpp \
111103
-D arch=\""$(arch)"\" \
112104
-D artifact_name_prefix=\""${artifact_name_prefix}"\" \
113105
-D build_version=\""${build_version}"\" \
114-
-D ostree_ref=\""${ostree_ref}"\" \
115-
-D ostree_repo=\""${ostree_repo}"\" \
116106
-D ociarchive=\""${ostree_container}"\" \
117107
-D osname=\""${osname}"\" \
118108
-D container_imgref=\""${container_imgref}"\" \

0 commit comments

Comments
 (0)