From patchwork Wed Dec 23 02:41:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ansis Atteka X-Patchwork-Id: 560338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 6CBB2140B9B for ; Wed, 23 Dec 2015 13:41:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira-com.20150623.gappssmtp.com header.i=@nicira-com.20150623.gappssmtp.com header.b=OfW2ENxD; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id AAFB910AF3; Tue, 22 Dec 2015 18:41:47 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id C42AB10AF1 for ; Tue, 22 Dec 2015 18:41:46 -0800 (PST) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id ED43B420219 for ; Tue, 22 Dec 2015 19:41:45 -0700 (MST) X-ASG-Debug-ID: 1450838505-09eadd632d191100001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id 7YmcU6hPEBJfSYDQ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 22 Dec 2015 19:41:45 -0700 (MST) X-Barracuda-Envelope-From: aatteka@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f45.google.com) (209.85.220.45) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 23 Dec 2015 02:41:45 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.45 Received: by mail-pa0-f45.google.com with SMTP id jx14so98421046pad.2 for ; Tue, 22 Dec 2015 18:41:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=vwnMIba6E+WGwAeV32pGQNAuEZSJVq7CnWWyEsmdj40=; b=OfW2ENxDXSviOlWSWL/15qWEo+KZjf2zWQ/n/vlln6NUGvbbCrxp7d0uILIl9xGVw8 3Bv3MxpRobAv98AYe1eqAYQ6vc2emYLPIgb9LQhSnTGtbHscH7gEVBHwtnSKptNuL7p2 2XkIrjsBhHrbNOErlAHhCOwbzYeZ/06suhsah2TjK/86o5mx+0cYJSSckpIiA8xRqxaE hb7gKPlZFN8SHpGH9lSPNSlQ/EJrCFrFs6UjfclMkNz2KYb6MvB8f/YdZBk5JIq2ACbG kAOXXifWNFOzH/jU8E6dSdPm8q6KyN9oEo7vt+cziVvn3T0V7YSawf8/8/lvX8YgwMIp FjLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vwnMIba6E+WGwAeV32pGQNAuEZSJVq7CnWWyEsmdj40=; b=XtetLqY/WborETe0WaYE17Vuc2jMJiREp/ONntHT9fjk+lFVl6eCf5F2Ks/1lvufoT h6sLtp/zxQHx0DcpdvNrF4N1TuO6XikDO4Ob9XEnbZoqsXcOdS6DpfMyChhPb4kUcmqJ aKMV0kbORXoAocXluux7/6yW/aDnqE89HukJDvhqC8KWltMmW0Gba0a86XMPDpbqhsMt Me1znx6671jk59ON60J4VrwGfDn398nCjSd1rsMuj4IbLlLnNp9QCkB1/U0GGp2E80t7 771+hsrA9Leu5nXrlz5auZiYSOTlF2s3nwgoVZW2Uulu4PXYT9k54ZC68DXkQTyV6G81 ZEgw== X-Gm-Message-State: ALoCoQk6PuLnIjTdc0rWaCxonS+chKpM5LuzLVL1fucW3cHx8j2EE/Ht03y7gAndKj/w6uQn/fwCBZWqocJujku9ND/uwg0B9g== X-Received: by 10.66.221.228 with SMTP id qh4mr40297685pac.68.1450838504144; Tue, 22 Dec 2015 18:41:44 -0800 (PST) Received: from aatteka-MacBookPro.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id 2sm805986pft.5.2015.12.22.18.41.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Dec 2015 18:41:43 -0800 (PST) X-CudaMail-Envelope-Sender: aatteka@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.1.34 From: Ansis Atteka To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1221095886 X-CudaMail-DTE: 122215 X-CudaMail-Originating-IP: 209.85.220.45 Date: Tue, 22 Dec 2015 18:41:35 -0800 X-ASG-Orig-Subj: [##CM-E2-1221095886##][PATCH] debian: Remove old PKI directory migration code Message-Id: <1450838495-18542-1-git-send-email-aatteka@nicira.com> X-Mailer: git-send-email 2.1.4 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1450838505 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH] debian: Remove old PKI directory migration code X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Open vSwitch 1.3 and older was creating certificates and private key in /usr/share/openvswitch/pki. However, since PKI directory is mutable, then this was considered a bug and PKI directory was moved to /var directory in Open vSwitch 1.4 Commit 14bd2d51 (debian: Move PKI directory to FHS-compliant location.) Note, that Ubuntu 12.04 already was shipping with Open vSwitch 1.4 and should have created (in case of fresh install) or moved (in case of upgrade from Open vSwitch 1.3) this directory to the right location. So I am inclined to remove this code because the only reason for it to exist would be, if someone would be upgrading from Open vSwitch 1.3 or older version directly to 2.5 without using any intermediary upgrade releases. Signed-Off-By: Ansis Atteka Acked-by: Ben Pfaff --- debian/openvswitch-pki.postinst | 8 -------- debian/openvswitch-pki.postrm | 5 ----- debian/openvswitch-testcontroller.postinst | 8 -------- 3 files changed, 21 deletions(-) diff --git a/debian/openvswitch-pki.postinst b/debian/openvswitch-pki.postinst index f4705e9..75b4777 100755 --- a/debian/openvswitch-pki.postinst +++ b/debian/openvswitch-pki.postinst @@ -19,14 +19,6 @@ set -e case "$1" in configure) - # Move the pki directory from its previous, non FHS-compliant location, - # to its new location, leaving behind a symlink for compatibility. - if test -d /usr/share/openvswitch/pki && \ - test ! -e /var/lib/openvswitch/pki; then - mv /usr/share/openvswitch/pki /var/lib/openvswitch - ln -s /var/lib/openvswitch/pki /usr/share/openvswitch/pki - fi - # Create certificate authorities. if test ! -e /var/lib/openvswitch/pki; then ovs-pki init diff --git a/debian/openvswitch-pki.postrm b/debian/openvswitch-pki.postrm index bc91e13..5db4d6b 100755 --- a/debian/openvswitch-pki.postrm +++ b/debian/openvswitch-pki.postrm @@ -22,11 +22,6 @@ set -e case "$1" in purge) rm -f /var/log/openvswitch/ovs-pki.log* || true - - # Remove backward compatibility symlink, if present. - if test -h /usr/share/openvswitch/pki; then - rm -f /usr/share/openvswitch/pki - fi ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/openvswitch-testcontroller.postinst b/debian/openvswitch-testcontroller.postinst index 7242b4a..7a25083 100755 --- a/debian/openvswitch-testcontroller.postinst +++ b/debian/openvswitch-testcontroller.postinst @@ -21,14 +21,6 @@ set -e case "$1" in configure) cd /etc/openvswitch-testcontroller - - # If cacert.pem is a symlink to the old location for cacert.pem, - # remove it so that we can symlink it to the new location. - if test -h cacert.pem && \ - test X"`readlink cacert.pem`" = X/usr/share/openvswitch/pki/switchca/cacert.pem; then - rm -f cacert.pem - fi - if ! test -e cacert.pem; then ln -s /var/lib/openvswitch/pki/switchca/cacert.pem cacert.pem fi