From patchwork Thu Nov 22 23:36:19 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: 1002061 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 431G7q59Jwz9s3C for ; Fri, 23 Nov 2018 10:37:27 +1100 (AEDT) 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="BdJ0y0lV"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="lCq3ju8p"; 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 431G7q3V4gzDqS8 for ; Fri, 23 Nov 2018 10:37:27 +1100 (AEDT) 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="BdJ0y0lV"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="lCq3ju8p"; 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.28; helo=out4-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="BdJ0y0lV"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="lCq3ju8p"; dkim-atps=neutral Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 431G7517ZTzDqRw for ; Fri, 23 Nov 2018 10:36:48 +1100 (AEDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id C003121EAE; Thu, 22 Nov 2018 18:36:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 22 Nov 2018 18:36:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=fm1; bh=vsImfuXzX2A9KOgelojX5gwh3sS7UiJBcwG2lJmAKXY=; b=BdJ0y 0lVZraXvxEnDxBM6Y4s6b7qTY6vOo0psRrj/9eqNPdK79+3ri5y00g8IXk9McLM7 YD267kzRx9WEkF3rAQK0tXjdOXfiXTYjejzguEugITtv9qByGpDIWq3AJs7yHVKd fiJ7oxBpIN7CssvR1eGeJuMFw5U7gnN0TiElyTzy4mkJEnhSHH20QW6girkYHbJq VC/e4xMgm3k3Ui7b3P0VFLIpNSm6FHRnv4DzjG9ds1pyHm8c4Ku4a0/I5FlYJ7lg mLR70qyWbL8Z1l2z9Wl4+XECL+gtGa2I9mKhlh0vxiV5mVNoOUlq8GvbcRqjad6/ isXi4/F/Z9hglC2Kw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=vsImfuXzX2A9KOgelojX5gwh3sS7UiJBcwG2lJmAKXY=; b=lCq3ju8p 1sOG2royqvSgSRf4gjMDigex6dGc1g4ughY1MWhpBxaGrce9hD8tpskamNJpjcML wCPT5xkg3PnWpWKm32oAnzKbWDC+ERWgeIWPDjTiTrICDbfk8QMeQRzl+wlUshoW 4bdvFK0wdj8k4lOhOXDVZfcScRBKWGqwLFXxxuvTCRG0Hp/mCftL6jcr1TPRpPHb R5mt2B0ahH5ZEr15VCIMOQC54LJMWpyzpCiLXLFJtmtwIHJTw1byGzdqb/FTqe7l E5MvOgiER0ns8UrdzXUEwRqmXTFDO0nPnxgful5FociVeoYeT1C/2aCAWPh+dItO +LutkbMJERXLUA== X-ME-Sender: X-ME-Proxy: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 6161C102DE; Thu, 22 Nov 2018 18:36:44 -0500 (EST) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 02/13] utils/pb-sos: Don't create files in root by default Date: Fri, 23 Nov 2018 10:36:19 +1100 Message-Id: <20181122233630.6303-3-sam@mendozajonas.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122233630.6303-1-sam@mendozajonas.com> References: <20181122233630.6303-1-sam@mendozajonas.com> MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas 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 e3e8f6bb..44dcabd7 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