Skip to content

Commit bc9e40f

Browse files
committed
drop image-default.yaml
These settings are now defined fully in the fedora-coreos-config and rhel-coreos-config repos. Let's drop these definitions since they aren't needed.
1 parent 71c87db commit bc9e40f

File tree

2 files changed

+1
-38
lines changed

2 files changed

+1
-38
lines changed

src/cosalib/cmdlib.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,7 @@ def cmdlib_sh(script):
524524

525525

526526
def generate_image_json(srcfile):
527-
r = yaml.safe_load(open("/usr/lib/coreos-assembler/image-default.yaml"))
528-
for k, v in flatten_image_yaml(srcfile).items():
529-
r[k] = v
530-
return r
527+
return flatten_image_yaml(srcfile)
531528

532529

533530
def write_image_json(srcfile, outfile):

src/image-default.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)