From patchwork Mon Nov 18 19:23:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1196912 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M+JYoH5Q"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47GzQw2z2xz9sP4 for ; Tue, 19 Nov 2019 06:24:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1F9F3864CB; Mon, 18 Nov 2019 19:24:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id huohlW1em8yG; Mon, 18 Nov 2019 19:24:05 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 3D8C3864B2; Mon, 18 Nov 2019 19:24:05 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2D0D8C18DA; Mon, 18 Nov 2019 19:24:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id CDE68C07AC for ; Mon, 18 Nov 2019 19:24:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BCBED85E3A for ; Mon, 18 Nov 2019 19:24:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JuGKSAUgnGWe for ; Mon, 18 Nov 2019 19:24:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3B59C856B8 for ; Mon, 18 Nov 2019 19:24:03 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id 207so2728981pge.8 for ; Mon, 18 Nov 2019 11:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=TbGzpQ1cC5c4om/T3XqYvwW2IEu3ptEOITIa0MFED9g=; b=M+JYoH5QdmTDa/pXAJL4lh4K0ZhaZIjrCr3xSVSXjmVGyIRhes1FQlak5fZgxja5AT DeGFIdtamO3eE7KOkjkOITysfpv2FbI30KrVxBdlRmH/JrF4cFbpR3rvlH+E2WqEGl/R iWx1czqwgusUOU+Yy+mqewsbWJbX8T8a8b/6uR/PXazKqoxgsM0llzehzjiZzazpaxPw bc5bEjKoWHeSnq+tMX/6WCs+Kz6EPYzR6AigLXqc1EG68ccyYgLHiu4wHd8H9Qpq3swW bFyZg5u+KinssnDsxKtEBRCbHUrUf/ahOzc87gttz7ULpis637HQQCKbpJqmUtdhnsGM YIrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TbGzpQ1cC5c4om/T3XqYvwW2IEu3ptEOITIa0MFED9g=; b=XkxsCH+9iMBJIww6Zddb9VwXHHOBIfHVVw8qmwMhNnzAGlbAtwb5tyifMLKM9AOK+Y PTBuZBwLBlLcCcqfkq0R8YH+62Lg1Y8ScP7qpZ1qrHZ7Bw6pY1vUMMb3RTjji3VsZUtF fIQ3cMH8vuGNlKjde8izh2wEjyj1F30XLxOzlPZ6/Y/deubfuALlabUce5ggEOQ5QBEu gUb8KClID/EwgxMVMd4GXq9czKfYHse/2K09tUAMqSLkwivLM/e8/V261rlYii3fYPOc vo1uG0FNGQOBDXl3kMhnoxJnDTQ00yw5CTpi3ms79nsbCcxpFDMYbkAx8VbQNtc2x2d8 DaVQ== X-Gm-Message-State: APjAAAWZkJg6sxP853Y55jeaQr6QFUFLwXl2T5HqQ91Yd9mLNx93rHGc Qejzf4KR2Edlq68JQrnWNFn9m9bAWag= X-Google-Smtp-Source: APXvYqxZcBfdgr+BGqqtUuvjCH6W2k03Xcny+iGNsogA2ozVr8GYXXKLnQwVcP6C9s82/lW03X3f9Q== X-Received: by 2002:a63:cb50:: with SMTP id m16mr939042pgi.425.1574105042432; Mon, 18 Nov 2019 11:24:02 -0800 (PST) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id s11sm20286525pgo.85.2019.11.18.11.24.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Nov 2019 11:24:01 -0800 (PST) From: Yifeng Sun To: dev@openvswitch.org, yihung.wei@gmail.com Date: Mon, 18 Nov 2019 11:23:56 -0800 Message-Id: <1574105036-28928-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH] rhel: Fix ovs-kmod-manage.sh that may create invalid soft links X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Current code iterates every kernel under '/lib/modules' for a matched version. As a result, this script may create invalid soft links if the matched kernel doesn't have openvswitch-kmod RPM installed. This patch fixes it. VMWare-BZ: #2257534 Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh index a643b55ff0f8..a252b391ecba 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -157,7 +157,7 @@ fi #$kmod_high_ver" found_match=false -for kname in `ls -d /lib/modules/*` +for kname in $kversion; do IFS='.\|-' read -r -a pkg_ver_nums <<<"${kname}" pkg_ver=${pkg_ver_nums[$ver_offset]} @@ -184,14 +184,14 @@ if [ "$found_match" = "false" ]; then exit 1 fi -if [ "$requested_kernel" != "/lib/modules/$current_kernel" ]; then +if [ "$requested_kernel" != "$current_kernel" ]; then if [ ! -d /lib/modules/$current_kernel/weak-updates/openvswitch ]; then mkdir -p /lib/modules/$current_kernel/weak-updates mkdir -p /lib/modules/$current_kernel/weak-updates/openvswitch fi for m in openvswitch vport-gre vport-stt vport-geneve \ vport-lisp vport-vxlan; do - ln -f -s $requested_kernel/extra/openvswitch/$m.ko \ + ln -f -s /lib/modules/$requested_kernel/extra/openvswitch/$m.ko \ /lib/modules/$current_kernel/weak-updates/openvswitch/$m.ko done else