Skip to content

Commit 29e94e8

Browse files
guidotijskensguidotijskens
authored
Merge pull request #141 from guidotijskens/version01260
Version01260
2 parents 77c75e9 + 240b0f5 commit 29e94e8

File tree

164 files changed

+16630
-1520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+16630
-1520
lines changed

‎MANIFEST.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@ include data/10-oci-kvm.conf
1616
include data/91-oci-kvm.preset
1717
include data/91-oci-utils.preset
1818
include data/oci-image-cleanup.conf
19+
include data/oci-migrate-conf.yaml
20+
include tools/build_image/bin/*
21+
include tools/build_image/scripts/*
22+
include tools/build_image/templates/*
23+
include tools/build_image/Makefile
24+
include tools/build_image/README.md
1925
include buildrpm/*.spec
2026
include man/man?/*.[158]

‎bin/oci-compartmentid‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
# Copyright (c) 2021-2022 Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at
4+
# http://oss.oracle.com/licenses/upl.
5+
6+
# shortcut to this compartment ocid
7+
8+
METADATA=/usr/bin/oci-metadata
9+
THISOCID=$("${METADATA}" --get compartmentid --value-only)
10+
echo "${THISOCID}"

‎bin/oci-image-migrate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# http://oss.oracle.com/licenses/upl.
66

@@ -12,4 +12,4 @@ _PY3=/usr/bin/python3
1212
s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
1313

1414

15-
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-main.py $@
15+
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-main.py "$@"

‎bin/oci-image-migrate-import‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# http://oss.oracle.com/licenses/upl.
66

@@ -12,4 +12,4 @@ _PY3=/usr/bin/python3
1212
s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
1313

1414

15-
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-import-main.py $@
15+
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-import-main.py "$@"

‎bin/oci-image-migrate-upload‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# http://oss.oracle.com/licenses/upl.
66

@@ -12,4 +12,4 @@ _PY3=/usr/bin/python3
1212
s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
1313

1414

15-
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-upload-main.py $@
15+
exec ${_PY3} ${s_dir}/migrate/oci-image-migrate-upload-main.py "$@"

‎bin/oci-instanceid‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at
4+
# http://oss.oracle.com/licenses/upl.
5+
6+
# shortcut to this compartment ocid
7+
8+
METADATA=/usr/bin/oci-metadata
9+
THISOCID=$("${METADATA}" --get id --value-only)
10+
echo "${THISOCID}"

‎bin/oci-iscsi-config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
# Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at

‎bin/oci-kvm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# http://oss.oracle.com/licenses/upl.
66

@@ -13,6 +13,6 @@ _PY3=/usr/bin/python3
1313
s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
1414

1515

16-
exec ${_PY3} ${s_dir}/virt/oci-kvm-main.py $@
16+
exec ${_PY3} ${s_dir}/virt/oci-kvm-main.py "$@"
1717

1818

‎bin/oci-metadata‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ _PY3=/usr/bin/python3
1313
s_dir=`${_PY3} -c 'import os.path ; import oci_utils.impl ; print (os.path.dirname(oci_utils.impl.__file__))' 2>/dev/null`
1414

1515

16-
exec ${_PY3} ${s_dir}/oci-metadata-main.py $@
16+
exec ${_PY3} ${s_dir}/oci-metadata-main.py "$@"
1717

1818

‎bin/oci-network-config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

3-
# Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# http://oss.oracle.com/licenses/upl.
66

@@ -175,7 +175,7 @@ then
175175
cmd_line="$cmd_line --ip-address=${PRIVATE_IP}"
176176
fi
177177
# else
178-
# echo "GT ${COMMAND} handled elsewhere"
178+
# echo "_GT_ ${COMMAND} handled elsewhere"
179179
fi
180180

181181
if [ ${EXCLUDED_ITEMS[${COMMAND}]+_} ] && [ -n "${EXCLUDED_ITEMS[${COMMAND}]}" ]

0 commit comments

Comments
 (0)