mirror of
https://github.com/clearlinux/bundle-chroot-builder.git
synced 2026-04-28 10:53:41 +00:00
Add url for swupd in builder.conf
The update client currently defaults to the public clearlinux url, and must be overridden with cmd line options to use other version/content/format urls. This introduces a problem when running a mix, and not supplying the mix URL will cause swupd to update from the official URL, rather than the mixer url. With this patch, the URLs can all be specified and are inserted into conf files that the swupd client will read, to know what URL to default to. Signed-off-by: Tudor Marcu <tudor.marcu@intel.com>
This commit is contained in:
@@ -2,3 +2,10 @@
|
||||
SERVER_STATE_DIR = /var/lib/update
|
||||
BUNDLE_DIR = /home/clr/mix/bundles
|
||||
YUM_CONF = /usr/share/defaults/bundle-chroot-builder/yum.conf
|
||||
|
||||
[swupd]
|
||||
BUNDLE=os-core-update
|
||||
URL=https://download.clearlinux.org/update/
|
||||
CONTENTURL=https://download.clearlinux.org/update/
|
||||
VERSIONURL=https://download.clearlinux.org/update/
|
||||
FORMAT=3
|
||||
|
||||
@@ -271,6 +271,34 @@ def create_chroots(args, state_dir, bundles, yum_conf):
|
||||
for r in results_list:
|
||||
r.get()
|
||||
|
||||
"""Read the URL values from builder.conf and insert them into os-core-update to swupd knows where to pull content from"""
|
||||
buildconf='/usr/share/defaults/bundle-chroot-builder/builder.conf'
|
||||
if os.path.isfile('/etc/bundle-chroot-builder/builder.conf'):
|
||||
buildconf = '/etc/bundle-chroot-builder/builder.conf'
|
||||
if args.config:
|
||||
buildconf = args.config
|
||||
config = configparser.ConfigParser()
|
||||
config.read(buildconf)
|
||||
|
||||
"""Read the configuration file for our script values"""
|
||||
conf = config['swupd']
|
||||
bundlename = conf['BUNDLE']
|
||||
url = conf['URL']
|
||||
contenturl = conf['CONTENTURL']
|
||||
versionurl = conf['VERSIONURL']
|
||||
formatname = conf['FORMAT']
|
||||
|
||||
confpath = os.path.join(out_dir, bundlename, "/usr/share/defaults/swupd/")
|
||||
os.mkdir(confpath)
|
||||
with open(os.path.join(confpath, "url"), "w") as file:
|
||||
file.writelines(url)
|
||||
with open(os.path.join(confpath, "contenturl"), "w") as file:
|
||||
file.writelines(contenturl)
|
||||
with open(os.path.join(confpath, "versionurl"), "w") as file:
|
||||
file.writelines(versionurl)
|
||||
with open(os.path.join(confpath, "format"), "w") as file:
|
||||
file.writelines(formatname)
|
||||
|
||||
print("Creating package to file mappings")
|
||||
package_mapping = {}
|
||||
map_files = [f for f in os.listdir(out_dir) if f.startswith("pkgmap-")]
|
||||
|
||||
Reference in New Issue
Block a user