From 776fd4a557bb91337d790a3fe04ea914f1cd9acc Mon Sep 17 00:00:00 2001 From: Melissa Wang Date: Fri, 18 Dec 2020 15:57:49 -0500 Subject: [PATCH] build-img: Remove by-path symlinks for AWS images In the graphical installation of an AWS-compatible image, there are duplicate symlinks created by the udev persistent storage rules. This change comments out the deprecated persistent storage rules in /usr/lib/udev/rules.d/ during the setup work for the AWS image. This issue has not been found in regular qcow2 images. Tested on OpenStack in a distributed cloud system and on AWS. Story: 2007858 Task: 41482 Change-Id: Icbf9e753042e29536bd92b13e4d779d97de1c5f2 Signed-off-by: Melissa Wang --- build-tools/build-img | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/build-img b/build-tools/build-img index 1b3d43cd..8bf65397 100755 --- a/build-tools/build-img +++ b/build-tools/build-img @@ -243,6 +243,10 @@ add_aws_setup(){ AWS_OAM_IF=ens5 AWS_MGMT_IF=ens6 cat >>"$ks_addon" <<_END + +# Comment out deprecated virtio by-path rules to avoid duplicate symlinks +sed -i 's/^\(KERNEL.*disk\/by-path\/virtio\)/#\1/' /usr/lib/udev/rules.d/60-persistent-storage.rules + cat >/etc/modules-load.d/ena.conf <