7446c32197
It has always been a weird thing that dib is a python package, but is totally driven by the disk-image-create script. It creates this strange division that is hard to explain. This moves disk-image-create to a regular python entry-point Currently, this simply exec()s the original disk-image-create script. However, we now have a (private) interface between disk-image-create written in python and the driver shell script. Here's some things we could do, for example: * Argument parsing is generally nicer in Python, and then end result is mostly just setting environment variables to flag different things in the shell script. I could see us moving the argument-parsing into diskimage_builder.disk_image_create:main() and just setting things in os.environ before the exec()). * I7092e1845942f249175933d67ab121188f3511fd sets IMAGE_ELEMENT_YAML in disk-image-create by calling-back to element-info. We can just call element_dependencies.find_all_elements() in here an export is to os.environ before disk-image-create starts. * remove need for ramdisk-image-create symlink by just exporting IS_RAMDISK based on sys.argv[1] value * you could even unit test some of this :) Change-Id: I69ca3d26fede0506a6353c077c69f735c8d84d28
47 lines
1.6 KiB
Python
47 lines
1.6 KiB
Python
# Copyright 2016 Ian Wienand (iwienand@redhat.com)
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# Python Logging Configuration for DIB
|
|
# Usage:
|
|
# In the main (application) file, do an
|
|
# import logging_config
|
|
# ...
|
|
# logging_config.setup()
|
|
# It is then possible to use the normal python logging interface, like
|
|
# logger = logging.getLogger(__name__)
|
|
# logger.info("Info Message")
|
|
|
|
import os
|
|
import os.path
|
|
import sys
|
|
|
|
import diskimage_builder.paths
|
|
|
|
|
|
def main():
|
|
environ = os.environ
|
|
|
|
# pre-seed some paths for the shell script
|
|
environ['_LIB'] = diskimage_builder.paths.get_path('lib')
|
|
|
|
# we have to handle being called as "disk-image-create" or
|
|
# "ramdisk-image-create". ramdisk-iamge-create is just a symlink
|
|
# to disk-image-create
|
|
# XXX: we could simplify things by removing the symlink, and
|
|
# just setting IS_RAMDISK in environ here depending on sys.argv[1]
|
|
script = "%s/%s" % (diskimage_builder.paths.get_path('lib'),
|
|
os.path.basename(sys.argv[0]))
|
|
|
|
os.execve("/bin/bash", ['bash', script] + sys.argv[1:], environ)
|