From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6664521764891000832 X-Received: by 2002:a2e:8ec9:: with SMTP id e9mr947295ljl.6.1551704892920; Mon, 04 Mar 2019 05:08:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:92cf:: with SMTP id k15ls1936840ljh.6.gmail; Mon, 04 Mar 2019 05:08:12 -0800 (PST) X-Google-Smtp-Source: APXvYqyPI/F9G600g6SuWQwQgav+USNhz9Psja0w+JQktTcmLPlhlyXLBuWEoyfvgKe2pBNwCZxN X-Received: by 2002:a2e:9ac9:: with SMTP id p9mr1020887ljj.13.1551704892478; Mon, 04 Mar 2019 05:08:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551704892; cv=none; d=google.com; s=arc-20160816; b=vQPvp3snDMbbUbJDTcMxKAflRKBANcPuNaxMPzA1o9+dOSzc887TWHO+aXcfoPfxxI zbfKca9URxynVK6T2Uky+8NBGKG42l+NSwJWiuGByteeTUX2N96Ea/3a44yvAhRJ2Ecn D9FR5IxPvTyq0uG8GM+YN7ZTaAeJ9eUXdqW9SKISFm7fZtTKQ78TQUA42fOZaxO3IYw8 pQ1Y6M2n0CD1c8/FpurheWwD1dRRFv6thn7B+FFKtW42UX+greIWW9ATCzHrht6GM0NA nblyMSBVeWb5evs9KMVH+miAg1Vi7ntxmNQPWiz/2KOWLXFVOLGmqmNzPwHgbceeT0S2 9j7Q== 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:cc:to:from; bh=t+76A6JgFMVpLTpasFucmgYQAjg2GLqBCLF2Xg8khtE=; b=XN2AYtVhtQBjLT2lTz77HCrYPXJ9zu+dBtwpOJ8H+v9KDRpvxcABjx2bXfYrT6F0Jy VA1i9s8uWJhXsos7R5c1Lsg98cEwLveG/PXb0XzCoy5FOLxKLvABSuwxiqQz8lW8vMme Po3imyHsTNjwqbS/leBJEsdoZ94iG8TB4zbQYR9vAU247ByROPquHWh2m9CnTRpzZcDm YAgZF/YclaNqBZ6+eCr9jKNtjgxuMNgh+HrF/ePtEbzC3Hacl/jsXEP2x615pDHvMqlx w3Uy6wbTn8f6GvvXUAuHhY+1Y45vcbwSuwkIBU3asrfCKsgXx0F+s31gSlozg6rjcmUq aNBg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m16si198116lfl.0.2019.03.04.05.08.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 05:08:12 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x24D8BLP022425 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 4 Mar 2019 14:08:11 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x24D89Wu008505; Mon, 4 Mar 2019 14:08:10 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Harald Seiler Subject: [PATCH v4 5/6] wic: Refactor fakeroot script Date: Mon, 4 Mar 2019 14:08:00 +0100 Message-Id: <20190304130801.20628-6-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190304130801.20628-1-claudius.heine.ext@siemens.com> References: <20190304130801.20628-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: +zP/Kk5ckEHi From: Harald Seiler 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.20.1