From patchwork Thu Jun 28 06:41:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 935954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41GVZw4c80z9ryk for ; Thu, 28 Jun 2018 16:42:48 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="dQqOcmVi"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="s6cZgwk0"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41GVZw23v8zF1QL for ; Thu, 28 Jun 2018 16:42:48 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="dQqOcmVi"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="s6cZgwk0"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=66.111.4.25; helo=out1-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="dQqOcmVi"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="s6cZgwk0"; dkim-atps=neutral Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41GVZS5jYPzF1QD for ; Thu, 28 Jun 2018 16:42:23 +1000 (AEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id BFF4521AD3; Thu, 28 Jun 2018 02:42:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 28 Jun 2018 02:42:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=qbDzUthAvDdVUp5Q9zcx2zjE1yeYlZNvkk37EWsAPB8=; b=dQqOcmVi s0YhYMJUdIgVgiklFpj9CMB8Loc81huSIPyRpjQae1dyiPV6Eyp4gp2jNdU/WxJK MecqjWbicIRlBTz/qf3DkaWUdqoxDXPQpJ9KCR1TmbRjxgezDM3rBg0IWHJwLSiY ynNvLtObmFVfdl0Tgc9pCvqjqKkbxjDoM42za+w5kKfwFYUKXiw6NkwrI0zpEH2u HpCADc7TB1QuAcvX3GhcC/qAdWyTgWJGs7AySXyIBUB7g0KeXvXL16jx2K+mEgcR FeF6L/5Mjqhdxdhf4hNOZa8IBGQMdZtIyeguuNzxKGI6jfQ7ujplc27qsbJ2N3/2 Sj6cJzEtXAzUzQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=qbDzUthAvDdVUp5Q9zcx2zjE1yeYlZNvkk37EWsAPB8=; b=s6cZgwk0 C+ERyc2c66cB+s6rmrCbQdHfZuMvegykO5gQZxScMz3pMWZ1uCP5tyKU/hSHLwnV s3bwWrPg5922CNvyEaJ6Jc/isY/AFJdRkivxmNWEdbeys9RVC59sWqKsUh9IQMTp bowyuk7czl6+RFYwma7K0Iw/auQZi/MHiphBbtJbhst5fihOIkMwny4G10oFonpm xegK6NDxJ/z26oyD9tWCj9kylgKQGAHN+ZQ7BpG62yL3tHBmaGh5fRRF5Cp+xXxr oUTpRmVe37Cl2c8621vVhNiafeESq+vMqPQsJGNV1jdrakMJ1l4GFh9AS04ixG9v smszu92XhUeNow== X-ME-Proxy: X-ME-Sender: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 513FB102EB; Thu, 28 Jun 2018 02:42:07 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [RFC PATCH 02/13] utils/pb-sos: Don't create files in root by default Date: Thu, 28 Jun 2018 16:41:40 +1000 Message-Id: <20180628064151.13370-3-sam@mendozajonas.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628064151.13370-1-sam@mendozajonas.com> References: <20180628064151.13370-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" If running in a non-root shell the user will not be able to create or access files in / so operate in the current directory instead. Signed-off-by: Samuel Mendoza-Jonas --- utils/pb-sos | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/utils/pb-sos b/utils/pb-sos index e3e8f6b..44dcabd 100755 --- a/utils/pb-sos +++ b/utils/pb-sos @@ -43,32 +43,31 @@ do shift done -mkdir -p /$diagdir +mkdir -p $diagdir # Include version of pb-discover -pb-discover --version > /$diagdir/version +pb-discover --version > $diagdir/version # Unconditionally grab relevant /var/log files log "Adding files from /var/log" -cp -r /var/log/messages /var/log/petitboot /$diagdir/ +cp -r /var/log/messages /var/log/petitboot $diagdir/ # Check if pb-discover segfaulted if [ -r $corefile ] then log "Adding core dump" - cp /core /$diagdir/ + cp /core $diagdir/ fi # Copy dmesg log "Adding dmesg" -dmesg > /$diagdir/dmesg +dmesg > $diagdir/dmesg # Add Skiboot log log "Adding Skiboot log" -cat /sys/firmware/opal/msglog > /$diagdir/msglog +cat /sys/firmware/opal/msglog > $diagdir/msglog log "Compressing..." -cd / tar $tarflags $tarfile $diagdir gzip < $tarfile > $tarfile.gz