ee46e2f9b7
Make a version-less RHEL element to handle both '7' and '8' DIB_RELEASE. The element usage should align with other elements which operate in the same way such as the Fedora element. Additionally, this patch adds support for RHEL8 that operates with Python 3. As of now, users of diskimage-builder will still be able to use the 'rhel7' element, or migrate to 'rhel' and specify their respective DIB_RELEASE value. * mount the xfs file-system for extraction as read-only. vaguely based on explaination in [1] and the fact we only read the image data into a tar, so can ignore this. XFS (dm-1): Superblock has unknown read-only compatible features (0x4) enabled. * Use the redhat system python as the dib-python version. dib was ahead of it's time making an abstracted python interpreter for system work ;) the system python should work for running the various dib element scripts. [1] https://unix.stackexchange.com/questions/247550/unmountable-xfs-filesystem Redhat-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1700253 Co-Authored-By: Ian Wienand <iwienand@redhat.com> Change-Id: I90540675c70bb475d9db2ae24f81c648a31f3f95
47 lines
1.5 KiB
Text
Executable file
47 lines
1.5 KiB
Text
Executable file
#!/usr/local/bin/dib-python
|
|
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
# Copyright 2014 Red Hat, Inc.
|
|
#
|
|
# 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.
|
|
import os
|
|
import sys
|
|
|
|
import yaml
|
|
|
|
|
|
def load_service_mapping(filepath="/usr/share/svc-map/services"):
|
|
if not os.path.isfile(filepath):
|
|
return {}
|
|
with open(filepath, 'r') as data_file:
|
|
return yaml.safe_load(data_file.read())
|
|
|
|
|
|
def main():
|
|
for arg in sys.argv[1:]:
|
|
# We need to support the service name being different when installing
|
|
# from source vs. packages. So, if the requested service file already
|
|
# exists, just use that.
|
|
if os.path.exists('/lib/systemd/system/%s.service' % arg): # systemd
|
|
print(arg)
|
|
elif os.path.exists('/etc/init/%s.conf' % arg): # upstart
|
|
print(arg)
|
|
else:
|
|
service_map = load_service_mapping()
|
|
name = service_map.get(arg, arg)
|
|
print(name)
|
|
sys.exit(0)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|