Skip to content

OLSS: Update for OL 9.4 and 8.10 releases #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 4, 2024
Merged

OLSS: Update for OL 9.4 and 8.10 releases #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6de856a
feat(olit): :sparkles: ol9u4 updates
AmedeeBulle May 17, 2024
03cb7d4
fix(olss): :bug: sysprep: truncate resolv.conf
AmedeeBulle May 21, 2024
36d91d8
feat(olss): :sparkles: ol8u10 updates
AmedeeBulle May 27, 2024
98018dc
fix(olss): :bug: pin kernel-core package.
AmedeeBulle May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions oracle-linux-image-tools/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ They currently support:

- Distributions:
- Oracle Linux 7 update 9 -- Slim (x86_64 only)
- Oracle Linux 8 update 9 -- Slim (x86_64 and aarch64)
- Oracle Linux 9 update 3 -- Slim (x86_64 and aarch64)
- Oracle Linux 8 update 10 -- Slim (x86_64 and aarch64)
- Oracle Linux 9 update 4 -- Slim (x86_64 and aarch64)
- Clouds:
- Microsoft Azure cloud (x86_64)
Target packages: WALinuxAgent
Expand Down Expand Up @@ -110,7 +110,7 @@ In that case, you will have to provide an URL to an installation tree and option
Example for an Oracle Linux 9 using the UEK boot ISO:

```Shell
ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u3/x86_64/OracleLinux-R9-U3-x86_64-boot-uek.iso"
ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-boot-uek.iso"
REPO_URL="https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64"
REPO[AppStream]="https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64"
REPO[ol9_UEKR7]="https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64"
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/bin/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ image_cleanup() {

virt-sysprep --delete "${BUILD_INFO}" \
--truncate /etc/machine-id \
--truncate /etc/resolv.conf \
-a "${WORKSPACE}/${VM_NAME}/${VM_NAME}.qcow2" \
"${virt_sysprep_args[@]}"

Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol8-aarch64/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL8U9_aarch64"
DISTR_NAME="OL8U10_aarch64"

# Distribution release
readonly ORACLE_RELEASE=8
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol8-aarch64/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ distr::kernel_config() {
if [[ ${UEK_RELEASE} != 6 ]]; then
if [[ ${KERNEL_MODULES,,} == "no" ]]; then
common::echo_message "Removing kernel modules"
dnf mark install kernel-uek-core
distr::remove_rpms kernel-uek-modules
else
common::echo_message "Ensure kernel modules are installed"
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol8-slim/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL8U9_x86_64"
DISTR_NAME="OL8U10_x86_64"

# Distribution release
readonly ORACLE_RELEASE=8
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol8-slim/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ distr::kernel_config() {
if [[ ${KERNEL,,} = "uek" && ${UEK_RELEASE} != 6 ]]; then
if [[ ${KERNEL_MODULES,,} == "no" ]]; then
common::echo_message "Removing kernel modules"
dnf mark install kernel-uek-core
distr::remove_rpms kernel-uek-modules
else
common::echo_message "Ensure kernel modules are installed"
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol9-aarch64/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL9U3_aarch64"
DISTR_NAME="OL9U4_aarch64"

# Distribution release
readonly ORACLE_RELEASE=9
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol9-aarch64/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ distr::kernel_config() {

if [[ ${KERNEL_MODULES,,} == "no" ]]; then
common::echo_message "Removing kernel modules and linux firmware"
dnf mark install kernel-uek-core
distr::remove_rpms kernel-uek-modules linux-firmware
else
common::echo_message "Ensure kernel modules are installed"
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol9-slim/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL9U3_x86_64"
DISTR_NAME="OL9U4_x86_64"

# Distribution release
readonly ORACLE_RELEASE=9
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol9-slim/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ distr::kernel_config() {
rm -rf /var/lib/dnf/*
if [[ ${KERNEL_MODULES,,} == "no" ]]; then
common::echo_message "Removing kernel modules and linux firmware"
dnf mark install "${kernel}-core"
distr::remove_rpms "${kernel}-modules" linux-firmware
else
common::echo_message "Ensure kernel modules are installed"
Expand Down