From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657041487194226688 X-Received: by 2002:a1c:4183:: with SMTP id o125mr191483wma.24.1549963259616; Tue, 12 Feb 2019 01:20:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4982:: with SMTP id r2ls3085031wrq.0.gmail; Tue, 12 Feb 2019 01:20:59 -0800 (PST) X-Google-Smtp-Source: AHgI3IbwpIWWtwxq7RsOSjLo5q1gdE4NmqzGQdK62fd/L1VmZCp0Hnslnc5ddVWsbhVCcyoqoxaB X-Received: by 2002:adf:dbd0:: with SMTP id e16mr137611wrj.31.1549963259236; Tue, 12 Feb 2019 01:20:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549963259; cv=none; d=google.com; s=arc-20160816; b=ddd1XMRviIH4kQJ31nG4VBXIdL45Z7GVyoOLhiLAiS/khAJKNinShZnzrlNtcavLPu Y5MlMe5I+MnmVaVcZ9KJwRMVzUmgjydwU3KzsfWU+1u++m97Q2a0xj3BnqgQclBik2n/ +ZZppr61htS/L64DLfWd+/MEtHio5fewsyfKbA0DjqcoSSiDlqRrLS9qHhpw5CVYWJGv N+mxc/5oiaNedXhNNjl36JGf7DJyxbuDHZwr1NDReE2Ua3WASK9FxwmainVWme6pG3Mm 9vfghrWR3yfDz7ptEEHKyJGH2TlWH2PUR+m0Y1MT9wHcxx+s06KRxTtlskm/qTuBwaNs NtDQ== 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=veMFf3TfIEUabrTRepRM9NSIlcdAar/MZPJlrbs0MWftn7nrX0HWoGzCTEle8rL/MX 7tDLCU+DCebpRgme7Kesmio3S1XC6qpOUwgCPMqB6IpfXSG3W8xUNgKu+x4tX/Uwpv88 hou+/AaP3H5VhmCcf5I+DWDh6yUCJgtaDvSx7E2TMWuH+Bhur3SQig1RlHegQKKHhBEJ DBBSlPceN50kUHIMEL4RPycamtmaAbCCwB3mWKkaQSp/5egavocRGU4HGDReqa9Fql6o Kd+/oHApJGoo9hGLd/5gZBpnB2REC2M6V5SrLn1v/zHxUXMCoT8KcMn9lewcBnbyBfg9 /CJg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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.10]) by gmr-mx.google.com with ESMTPS id t23si109145wmt.1.2019.02.12.01.20.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 01:20:59 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of hws@denx.de) client-ip=212.18.0.10; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 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 43zHFl0Z5Tz1r0hB for ; Tue, 12 Feb 2019 10:20:59 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43zHFl0RV4z1qvWm for ; Tue, 12 Feb 2019 10:20:59 +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 2MCtn_c8v1Hu for ; Tue, 12 Feb 2019 10:20:58 +0100 (CET) X-Auth-Info: mTAcX62GzVITskrUjJwm9IM0+xnDpThorzVW5VRjD+g= 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 10:20:58 +0100 (CET) From: Harald Seiler To: isar-users@googlegroups.com Subject: [PATCH 4/4] wic: Refactor fakeroot script Date: Tue, 12 Feb 2019 10:20:46 +0100 Message-Id: <20190212092046.6508-5-hws@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212092046.6508-1-hws@denx.de> References: <20190212092046.6508-1-hws@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: agw4suQNrZj0 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