From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8316B1382C5 for ; Sun, 20 Dec 2020 02:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6483EE093E; Sun, 20 Dec 2020 02:28:57 +0000 (UTC) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D280E093E for ; Sun, 20 Dec 2020 02:28:57 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id b64so5989940qkc.12 for ; Sat, 19 Dec 2020 18:28:57 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=R5ZWCdUbS71DJBzMDj/ZF7cfuElU3JDWtLjkj1tM2+w=; b=Twl/IMQhwgMK2E6+kIjZu6xHaNHCHTSqCNlt/EYtdU/SRUSuow/K38OJQ+UbCAmYUY TzFeqPjanvfK0qikR0OyAwsHGfr481L6YMwlickrlHrn0GD7/5m6JQq2sgqoWh8rhS+m Ha4vEvp5j4SlCkt3GZdhGEK4py3igmhNAENpAlkdhpk3VCGGhldNw+0owKJzyLMC2opB GsfmZbFpPLSy69GH/j0NUzfBxkqRBELLy9WKV6epBczwJ1jrv9lBjl1bInhaSRt51dbl pxwb3knJrAoSYjrOOEagvauJe+4XIXjZ5HzwfHx8f8r5XOc3l7zvuy1Uru7OW0yfPqSm EygA== X-Gm-Message-State: AOAM5327AW/G8CBlbJ+FnMDzTXwBrQSMl5hSEOa1hrQzileaNJp3v1py rQCF95n2saLDXuPWM55+g5CHyokBTnIs8w== X-Google-Smtp-Source: ABdhPJxr8cD1nad8shI+dZ+NmEZWjuC7+IRYhsTOWAqpC1fYGE5iwCHdQBLnGljR8rkmC/dpkH28Ag== X-Received: by 2002:a37:7244:: with SMTP id n65mr11829037qkc.415.1608431336410; Sat, 19 Dec 2020 18:28:56 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id z26sm8145841qki.40.2020.12.19.18.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Dec 2020 18:28:55 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 3/7] catalyst: Remove some redundant set_stage_path()s Date: Sat, 19 Dec 2020 21:28:44 -0500 Message-Id: <20201220022848.249207-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201220022848.249207-1-mattst88@gentoo.org> References: <20201220022848.249207-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 8097dd14-842b-4938-bfd3-ef11fcc71dfd X-Archives-Hash: 58103381105b4555a689e5df854dc0b8 We only need to override root_path, and stage_path will be configured properly. Signed-off-by: Matt Turner --- catalyst/targets/embedded.py | 5 ----- catalyst/targets/stage1.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index e9138437..918b36bf 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -65,11 +65,6 @@ class embedded(StageBase): "clear_autoresume", ]) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+"/tmp/mergeroot") - log.info('embedded stage path is %s', self.settings['stage_path']) - def set_root_path(self): self.settings["root_path"] = normpath("/tmp/mergeroot") log.info('embedded root path is %s', self.settings['root_path']) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index be3eae93..5aa27bb9 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -23,11 +23,6 @@ class stage1(StageBase): def __init__(self, spec, addlargs): StageBase.__init__(self, spec, addlargs) - def set_stage_path(self): - self.settings["stage_path"] = normpath( - self.settings["chroot_path"]+self.settings["root_path"]) - log.notice('stage1 stage path is %s', self.settings['stage_path']) - def set_root_path(self): # sets the root path, relative to 'chroot_path', of the stage1 root self.settings["root_path"] = normpath("/tmp/stage1root") -- 2.26.2