Anatoly Litovsky has uploaded a new change for review. Change subject: Move udev rules reloading prior to network start and re trigger events ......................................................................
Move udev rules reloading prior to network start and re trigger events Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1251040 Signed-off-by: Tolik Litovsky <[email protected]> Change-Id: I04d3dd7a726c885433d13b137ecf75b8b8d01f57 --- M scripts/ovirt-init-functions.sh.in 1 file changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/85/44685/1 diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in index c0bbd2c..34d24d0 100644 --- a/scripts/ovirt-init-functions.sh.in +++ b/scripts/ovirt-init-functions.sh.in @@ -876,6 +876,17 @@ # config files (mounted in by the preceeding mount_config call) mount -a swapon -a + + [[ -f "/etc/udev/rules.d/71-persistent-node-net.rules" ]] && { + [[ $(rpm -E "%{?rhel"}) = 6 ]] || [[ $(rpm -E "%{?centos}") = 6 ]] && { + # Rename the interfaces after bind-mounting the udev rules, rhbz#831658 + rm -f /etc/udev/rules.d/70-persistent-net.rules + udevadm control --reload-rules + udevadm trigger --subsystem-match=net + udevadm settle --timeout=10 + } + } + service network restart service auditd restart fi @@ -917,15 +928,6 @@ hostname $HOSTNAME fi fi - - [[ -f "/etc/udev/rules.d/71-persistent-node-net.rules" ]] && { - [[ $(rpm -E "%{?rhel"}) = 6 ]] || [[ $(rpm -E "%{?centos}") = 6 ]] && { - # Rename the interfaces after bind-mounting the udev rules, rhbz#831658 - rm -f /etc/udev/rules.d/70-persistent-net.rules - udevadm control --reload-rules - udevadm trigger --action=add --subsystem-match=net - } - } if [ -n "$adminpw" ]; then log "Setting temporary admin password" -- To view, visit https://gerrit.ovirt.org/44685 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04d3dd7a726c885433d13b137ecf75b8b8d01f57 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Anatoly Litovsky <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
