From patchwork Mon Nov 18 20:06:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1196930 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.136; helo=silver.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="G4Rba+Ld"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47H0N11f16z9sPT for ; Tue, 19 Nov 2019 07:06:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C3842202E; Mon, 18 Nov 2019 20:06:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ikKyDZrmsC9l; Mon, 18 Nov 2019 20:06:34 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 60ACD203D9; Mon, 18 Nov 2019 20:06:34 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 43D39C0880; Mon, 18 Nov 2019 20:06:34 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id A81CFC07AC for ; Mon, 18 Nov 2019 20:06:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A115A860C8 for ; Mon, 18 Nov 2019 20:06:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hwTxbmEroPE3 for ; Mon, 18 Nov 2019 20:06:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0D7CE860B0 for ; Mon, 18 Nov 2019 20:06:33 +0000 (UTC) Received: by mail-pg1-f176.google.com with SMTP id k13so10151443pgh.3 for ; Mon, 18 Nov 2019 12:06:33 -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=sCIXn/NNSOpWIo4JIAtfS4BLNOmNWX2NIdsS4d0XOl4=; b=G4Rba+LduyCe3R/y7+JXJDgMrK25Jy0vp7X01hcDLLPZ1fT7ADcIBLy+6H9WRoFsUe hGKrGX0ahF3Es3XXmwgP7G7lAwqcITa1AkEwATh3VUCX4fM0cdHXhJUzcsWU0DWxv6xn I/iXGwyV4eYZyineNYNI6RCz8lo22ZKkoXwcLFZyGwmv6vx028jsEVszL4xyru7WADTy UEFtlKaSWobiGvTPob4n9+GSwlncewsLSbrEc09vj8Qw8uzwfIlrEC33RPpJ/QTb7uM4 NLIxMrvrtzAMReUiOwbHf57eE7D2bVqWy5vEk/nOjpmPA+/Kdvqnr7cMqOkp2mKKZjWs mGuw== 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=sCIXn/NNSOpWIo4JIAtfS4BLNOmNWX2NIdsS4d0XOl4=; b=ajIUDbCkhFSLcI0EGyiQZY6Gypc+2Zy2dXEasroK9obAQtSAdrCka3zxEEyUbJanUz /s/T/u7bct/3YnZMLBEie4Bwayrafv90aAPVd1UoOuNht64j5ygzR79IwTd5CN3EHht3 2C0U0Vc7On29QTkniOgl/9UWXtdII6ufZDrmpjPle8VKxtaf3/+/8iNU1jhT83jyVstt 9k6anmfAFF7c10BOoTx5XAFEsNOH6Gks9yqHswmoNHqDAw5P67dajdQ2kP5rkaBSG0h4 ZWREH1eEU0d9C5p0j7dFUcbuc3x/2KNWVgv/vH25NdH1SgNjthGDFTBw5DXGUO0SyuQP BMjQ== X-Gm-Message-State: APjAAAXJEnIsPCnsje7YFKKRp48YDgSeEYcvz0JZgDVq5l6VYF93zNdc brCS5bH4Om9UgH62fTUACpPejnpGjBc= X-Google-Smtp-Source: APXvYqxMao76md5kgDwfHKZHYR6x2RIOq4MBS2savroNbrN5EMLMqag02FoIAEmU9XOpGY/IsbYoZQ== X-Received: by 2002:a63:e54f:: with SMTP id z15mr1156876pgj.453.1574107592322; Mon, 18 Nov 2019 12:06:32 -0800 (PST) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id t15sm23319815pgb.0.2019.11.18.12.06.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Nov 2019 12:06:31 -0800 (PST) From: Yifeng Sun To: dev@openvswitch.org Date: Mon, 18 Nov 2019 12:06:26 -0800 Message-Id: <1574107586-29029-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH v2] 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 Fixes: c3570519 ("rhel: add 4.4 kernel in kmod build with mulitple versions, fedora") Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- v1->v2: Added fix tag, thanks YiHung. 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