From 471f3bd1cfdf08329951811bfd4e4acc99d5c724 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 7 May 2020 12:10:27 -0400 Subject: [PATCH] Fix ubuntu profile name It was erroneously changed by initprofile.sh --- confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh | 2 +- librarian/osimport | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh index 00a4229d..1f68d5e6 100644 --- a/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh +++ b/confluent_osdeploy/ubuntu20.04/profiles/default/initprofile.sh @@ -1,5 +1,5 @@ #!/bin/sh -sed -i s/ubuntu/Ubuntu/ $2/profile.yaml && \ +sed -i s/label: ubuntu/label: Ubuntu/ $2/profile.yaml && \ ln -s $1/casper/vmlinuz $2/boot/kernel && \ ln -s $1/casper/initrd $2/boot/initramfs/distribution && \ mkdir -p $2/boot/efi/boot && \ diff --git a/librarian/osimport b/librarian/osimport index 6738c07c..861f781b 100644 --- a/librarian/osimport +++ b/librarian/osimport @@ -336,7 +336,6 @@ class MediaImporter(object): while wkr.poll() is None: currline += wkr.stdout.read(1) if b'\r' in currline: - print(repr(currline)) currline = b'' a = wkr.stdout.read(1) while a: @@ -368,7 +367,7 @@ class MediaImporter(object): profdata = profdata.replace('%%DISTRO%%', osd) profdata = profdata.replace('%%VERSION%%', osversion) profdata = profdata.replace('%%ARCH%%', arch) - profdata = profdata.replacey('%%PROFILE%%', profname) + profdata = profdata.replace('%%PROFILE%%', profname) if profdata: with open('{0}/profile.yaml'.format(dirname), 'w') as yout: yout.write(profdata)