diff --git a/centos-bareon/element-deps b/centos-bareon/element-deps index d7b7e04..077fc9d 100644 --- a/centos-bareon/element-deps +++ b/centos-bareon/element-deps @@ -1,2 +1,3 @@ package-installs - +centos-minimal +dhcp-all-interfaces diff --git a/centos-bareon/install.d/90-remove-all-network-dev-configs b/centos-bareon/install.d/90-remove-all-network-dev-configs new file mode 100644 index 0000000..79fc092 --- /dev/null +++ b/centos-bareon/install.d/90-remove-all-network-dev-configs @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +echo "Remove all prepared network device configuration(centos-minimall have" +echo "added couple of them). We can't predefine netowrk setup during image" +echo "build." +for iface in /etc/sysconfig/network-scripts/ifcfg-*; do + [ ! -e "$iface" ] && break + [ "$(basename "$iface")" = "ifcfg-lo" ] && continue + rm -v "$iface" +done diff --git a/centos-bareon/package-installs.yaml b/centos-bareon/package-installs.yaml index 0031a4a..682d84d 100644 --- a/centos-bareon/package-installs.yaml +++ b/centos-bareon/package-installs.yaml @@ -1,5 +1,4 @@ curl: -dhclient: policycoreutils: selinux-policy: selinux-policy-targeted: @@ -19,4 +18,3 @@ btrfs-progs: dosfstools: rsync: grub2: - diff --git a/centos-bareon/post-install.d/10-disable-udev-iface-rename b/centos-bareon/post-install.d/10-disable-udev-iface-rename deleted file mode 100755 index 8b733f9..0000000 --- a/centos-bareon/post-install.d/10-disable-udev-iface-rename +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then - set -x -fi - -set -e - -# Disabling this rule prevents inconsistent iface renames done by udev. This -# were conflicting with prebuilt dhcp scripts (ifcfg-eth0, ifcfg-eth1) as well -# as with dhcp-all-interfaces which was not able to generate scripts according -# to new names (because it runs concurrently with renaming). -# Using old schema (ethN) + pre-built dhcp scripts allows to have stable DHCP -# even if eth interfaces are randomly swapped. -ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules - -# Configs for additional interfaces -SYSCONFIG_PATH=/etc/sysconfig/network-scripts -for IFACE_NUM in 1 2 3 -do - cp $SYSCONFIG_PATH/ifcfg-eth0 $SYSCONFIG_PATH/ifcfg-eth$IFACE_NUM - sed -i "s/eth0/eth$IFACE_NUM/g" $SYSCONFIG_PATH/ifcfg-eth$IFACE_NUM -done -