From 2540d46b68b51a7b6e6c9f2bfa0afff7dfbbe4fd Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 23 Sep 2021 13:03:34 -0700 Subject: [PATCH 1/3] Make sure that ifcfg-XXXX files work properly --- containers/Singularity/centos-8.def | 9 ++++++++- containers/Singularity/rocky-8.def | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/containers/Singularity/centos-8.def b/containers/Singularity/centos-8.def index 6935d10a..bb7ca7d8 100644 --- a/containers/Singularity/centos-8.def +++ b/containers/Singularity/centos-8.def @@ -14,4 +14,11 @@ Include: dnf shadow-utils rsyslog tzdata util-linux words zlib tar less \ gzip which util-linux openssh-clients openssh-server dhclient \ pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ - wget centos-release ipmitool yum + wget centos-release ipmitool yum NetworkManager network-scripts + + systemctl disable NetworkManager + systemctl disable NetworkManager-dispatcher + systemctl disable NetworkManager-wait-online + systemctl enable network-scripts + + touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file diff --git a/containers/Singularity/rocky-8.def b/containers/Singularity/rocky-8.def index f4050036..6daa14e0 100644 --- a/containers/Singularity/rocky-8.def +++ b/containers/Singularity/rocky-8.def @@ -14,4 +14,11 @@ Include: dnf shadow-utils rsyslog tzdata util-linux words zlib tar less \ gzip which util-linux openssh-clients openssh-server dhclient \ pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ - wget rocky-release ipmitool yum NetworkManager \ No newline at end of file + wget rocky-release ipmitool yum NetworkManager network-scripts + + systemctl disable NetworkManager + systemctl disable NetworkManager-dispatcher + systemctl disable NetworkManager-wait-online + systemctl enable network-scripts + + touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file From 0dca35f6d90a06627e0b8e3b7491571dae01c0b3 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Fri, 24 Sep 2021 13:49:09 -0700 Subject: [PATCH 2/3] Another minor fixup for network initalization --- containers/Singularity/centos-8.def | 7 ++----- containers/Singularity/rocky-8.def | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/containers/Singularity/centos-8.def b/containers/Singularity/centos-8.def index bb7ca7d8..50c69bd7 100644 --- a/containers/Singularity/centos-8.def +++ b/containers/Singularity/centos-8.def @@ -14,11 +14,8 @@ Include: dnf shadow-utils rsyslog tzdata util-linux words zlib tar less \ gzip which util-linux openssh-clients openssh-server dhclient \ pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ - wget centos-release ipmitool yum NetworkManager network-scripts + wget centos-release ipmitool yum network-scripts - systemctl disable NetworkManager - systemctl disable NetworkManager-dispatcher - systemctl disable NetworkManager-wait-online systemctl enable network-scripts - + touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file diff --git a/containers/Singularity/rocky-8.def b/containers/Singularity/rocky-8.def index 6daa14e0..40a4048e 100644 --- a/containers/Singularity/rocky-8.def +++ b/containers/Singularity/rocky-8.def @@ -14,11 +14,8 @@ Include: dnf shadow-utils rsyslog tzdata util-linux words zlib tar less \ gzip which util-linux openssh-clients openssh-server dhclient \ pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ - wget rocky-release ipmitool yum NetworkManager network-scripts + wget rocky-release ipmitool yum network-scripts - systemctl disable NetworkManager - systemctl disable NetworkManager-dispatcher - systemctl disable NetworkManager-wait-online systemctl enable network-scripts - + touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file From cdf9e574e0f8efb42edfc3f1286410ddd0ed4174 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Fri, 24 Sep 2021 13:50:23 -0700 Subject: [PATCH 3/3] Fix systemctl servicename --- containers/Singularity/centos-8.def | 2 +- containers/Singularity/rocky-8.def | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/Singularity/centos-8.def b/containers/Singularity/centos-8.def index 50c69bd7..a3a6e66f 100644 --- a/containers/Singularity/centos-8.def +++ b/containers/Singularity/centos-8.def @@ -16,6 +16,6 @@ Include: dnf pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ wget centos-release ipmitool yum network-scripts - systemctl enable network-scripts + systemctl enable network touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file diff --git a/containers/Singularity/rocky-8.def b/containers/Singularity/rocky-8.def index 40a4048e..1f37857f 100644 --- a/containers/Singularity/rocky-8.def +++ b/containers/Singularity/rocky-8.def @@ -16,6 +16,6 @@ Include: dnf pciutils vim-minimal shadow-utils strace cronie crontabs cpio \ wget rocky-release ipmitool yum network-scripts - systemctl enable network-scripts + systemctl enable network touch /etc/sysconfig/disable-deprecation-warnings \ No newline at end of file