From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657041487194226688 X-Received: by 2002:a19:7506:: with SMTP id y6mr341000lfe.11.1549990636324; Tue, 12 Feb 2019 08:57:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7e08:: with SMTP id z8-v6ls2075242ljc.1.gmail; Tue, 12 Feb 2019 08:57:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IbA4z3rO5hSa+qqkvono7wklBRy9BTvfPvdDaW/28dl5cAfKi6jrG2xI1HtA1DnI+/hmfjP X-Received: by 2002:a2e:87ce:: with SMTP id v14-v6mr339673ljj.26.1549990634834; Tue, 12 Feb 2019 08:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549990634; cv=none; d=google.com; s=arc-20160816; b=fgEDuXbW/GbPmS6IGOLTHVM5EBxdmlc2O3NLdRwTZVNZ1fiwJ5gbR4kR1RDbn6tLgA oywAoPktujYStKamUZpJ0OZ2GQmpJd/YgUzseg5sxxTP+B420CCRHg25vs4RjXHsYKI4 BfnkD+TBlrg/qHR+umaSOlWVBcQaY74QNqKmFsHaiIYyjWWltdtWi25KwMaghSqskYGi yDafgiQwIf1JbdHTz/jrqrj77KH/n6No28bigA6pp+tg91SMetbwuv6Dvg5j+g737TGX sphmhLiN5WZLx0jjuHTgP7KvC0/DVwfw9TwCYwAglgIEZTu0mfzcSjkBTSA5rb8u4VUQ OfMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=bE7KAjXkH4gagR5sj8jXcteuqbdqFm0n/L7B11rLDxo=; b=KakJFwoQtGHzCTzeDiY4JpwfpRitxljiH52z1UAb0FEc9b44NUnLFxMPoN71bF6aI7 O/2mYrekYCKBuL48xZHrGNxWaoivVh90zf+sPAfitdOf+2UB1RxugovwqTAGLiRcc4/o dqiu7j8oWKB7AP0ovrhGIpJDFT9zkjJzfoZKa3EIndDZRDTEYFHepPjli3SRIyYYftKN 7dYQWxq0wrT1ToOXERJaMPf0T/my4+cT1+8680IVma0o6L2p43WiGLalUTP5IG53H6gE tcssKjTFcARwZ2ZIT5YHDzyPrZvOAgUGwP04vuwJImwQeVtqP9t73KPZD0bjSbb0wHFC KmKw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id a26si158554lff.2.2019.02.12.08.57.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 08:57:13 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.9; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by best guess record for domain of hws@denx.de) smtp.mailfrom=hws@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43zTN91mzlz1rV14 for ; Tue, 12 Feb 2019 17:57:13 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43zTN91h1tz1r2Gy for ; Tue, 12 Feb 2019 17:57:13 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id hrYCCw-T4bbP for ; Tue, 12 Feb 2019 17:57:12 +0100 (CET) X-Auth-Info: mrQeOCJYxibVeX/0m6GjaobIfMcvLU03QTJyy6h5GPk= Received: from sandvich.fritz.box (p578a821c.dip0.t-ipconnect.de [87.138.130.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 12 Feb 2019 17:57:12 +0100 (CET) From: Harald Seiler To: isar-users@googlegroups.com Subject: [PATCH v2 4/5] wic: Refactor fakeroot script Date: Tue, 12 Feb 2019 17:56:36 +0100 Message-Id: <20190212165637.19970-5-hws@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212165637.19970-1-hws@denx.de> References: <20190212165637.19970-1-hws@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ALDlGHAgJnYs Signed-off-by: Harald Seiler --- scripts/wic_fakeroot | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/wic_fakeroot b/scripts/wic_fakeroot index 9e01c38..88a03fa 100755 --- a/scripts/wic_fakeroot +++ b/scripts/wic_fakeroot @@ -11,7 +11,6 @@ # import os import sys -import shutil import subprocess args = sys.argv @@ -24,14 +23,12 @@ cmd = args[0] # i.e. in wics partition.py the "du -ks" fails on # var/cache/apt/archives/partial # rootfs/root ... -assert 'root' == os.environ["USER"] +assert os.geteuid() == 0, "wic_fakeroot must be run as root!" # e2fsck <= 1.43.5 returns 1 on non-errors (stretch and before affected) # treat 1 as safe ... the filesystem was successfully repaired and is OK if cmd.startswith('fsck.'): ret = subprocess.call(args) - if ret == 0 or ret == 1: - sys.exit(0) - sys.exit(ret) + sys.exit(0 if ret == 1 else ret) -os.execv(shutil.which(cmd), args) +os.execvp(cmd, args) -- 2.14.1