From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543573978583138304 X-Received: by 10.223.157.147 with SMTP id p19mr133172wre.17.1523544541811; Thu, 12 Apr 2018 07:49:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.187.19 with SMTP id r19ls1162952wrg.11.gmail; Thu, 12 Apr 2018 07:49:01 -0700 (PDT) X-Google-Smtp-Source: AIpwx48JVrwNcbkA62TtVeTkE0QBNIi3IgwszJBdQl1V9M9g3nkbDGwNh91HbuCIfZHEzsRWwrKg X-Received: by 10.223.226.141 with SMTP id v13mr140023wri.3.1523544541399; Thu, 12 Apr 2018 07:49:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523544541; cv=none; d=google.com; s=arc-20160816; b=NDeRqD04yd8r0aliz1v6hGJQvnm27XL5pJ1+E0Ypue3F9bLDFhQJlutiKf0tDrxsze K38fJ8FH8Ry9aI26AaFjb5t8ybe9TgesQJbOE2SXz1R4b2kS3yTAwPYMGBkJABtytVgU GVzv/LQBpuVVbJ+Dt+QGD6EpK5L2dullGXZY5AI8AdSjtyn1j9TSUttgXna5uD9IGHm8 E3bA5bvV3xQW6G9UQ3NSeNK3guMx5nGsMDOGuD0R2IdVzFSnzgJqFO8a/7Niohlj0prJ zcDfyu+VDhSCJPYPsWqEUoBMOgvhsWNomMtJuAmmQ7H4LrtPhLxO/mFuHcDAGlS4MGhy XCyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Z9q1jznP7XSq6bfnbzDf1Q6Dtzink+ba6GVE7Jbt9Q4=; b=BKLadnGyuxNnknUsTk3JCe8DHmLaBXHlKrvM0qHeJ5wWiL+y5CjvOuWu16FA8COPKn mf1rzbMGgnL2/xQogMgp68mmn+0CoptXEFOgmtWLamDLLwFVlXCK79M0b3HR+Acdn7Mn lukfBVonG/dY7APw5hL4Yw8NtyLOY5J/rpRHw7PJbyaBBc8x/9Qhz6Bh5NrjkYOQ9YS0 lLrYI20y0Kx9F4C7DgpujfjlUqbSW2qhj4TPtsFO6K6ka3VuAPlxDDlJZRx69+58NE77 aOxrvOWvKtvIch+ieR7B1K+cTJw97jUwIN28pi+O4TZ6kvbmtPkDeGB/9Gcf+qzYHRH0 zznw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id n11si222275wrh.4.2018.04.12.07.49.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 07:49:01 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w3CEn10S019851 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 12 Apr 2018 16:49:01 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3CEn0mI000717; Thu, 12 Apr 2018 16:49:00 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 3/3] scripts/start_vm: Deduplicate start_qemu Date: Thu, 12 Apr 2018 16:48:57 +0200 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: <7219cddfebd75ac1527471df0118009e6c9ae530.1523544076.git.henning.schild@siemens.com> References: <7219cddfebd75ac1527471df0118009e6c9ae530.1523544076.git.henning.schild@siemens.com> In-Reply-To: <7219cddfebd75ac1527471df0118009e6c9ae530.1523544076.git.henning.schild@siemens.com> References: <7219cddfebd75ac1527471df0118009e6c9ae530.1523544076.git.henning.schild@siemens.com> X-TUID: 2cbX32FqsGpt Instead of echoing what we are about to execute, switch the shell to verbose mode. But only toggle "x" if it was not seet already. This simplifies the script and future changes will only have to touch one spot. Signed-off-by: Henning Schild --- scripts/start_vm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/scripts/start_vm b/scripts/start_vm index 4cb05ae..26274be 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -17,22 +17,11 @@ bb2sh() { } start_qemu() { - root1=`echo $QEMU_ROOTFS_DEV \ - | sed 's,##ROOTFS_IMAGE##,$IMAGE_DIR/'"$ROOTFS_IMAGE"','` - echo -e "IMAGE_DIR=$IMAGE_DIR; \\\\\n\ -qemu-system-$QEMU_ARCH \\\\\n\ - -m 1024M \\\\\n\ - -M $QEMU_MACHINE \\\\\n\ - $QCPU\\\\\n\ - -nographic \\\\\n\ - -kernel \$QKERNEL \\\\\n\ - -initrd \$QINITRD \\\\\n\ - -append \"console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw\" \\\\\n\ - $EXTRA_ARGS \\\\\n\ - $root1" - - root2=`echo $QEMU_ROOTFS_DEV \ + root=`echo $QEMU_ROOTFS_DEV \ | sed 's,##ROOTFS_IMAGE##,'$IMAGE_DIR/$ROOTFS_IMAGE','` + local had_x + echo $- | grep -q x && had_x=1 || had_x=0 + [ $had_x -eq 0 ] && set -x qemu-system-$QEMU_ARCH \ -m 1024M \ -M $QEMU_MACHINE \ @@ -42,7 +31,8 @@ qemu-system-$QEMU_ARCH \\\\\n\ -initrd $QINITRD \ -append "console=$MACHINE_SERIAL root=/dev/$ROOTFS_DEV rw" \ $EXTRA_ARGS \ - $root2 + $root + [ $had_x -eq 0 ] && set +x } show_help() { -- 2.16.1