From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: by atuin.qyliss.net (Postfix, from userid 496) id D61AA1CA55; Sun, 8 Aug 2021 17:05:07 +0000 (UTC) Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id DDACF1C9F7; Sun, 8 Aug 2021 17:04:55 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id BCC621CA13; Sun, 8 Aug 2021 17:04:53 +0000 (UTC) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by atuin.qyliss.net (Postfix) with ESMTPS id A78871C9EB for ; Sun, 8 Aug 2021 17:04:49 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5712E5C00E8 for ; Sun, 8 Aug 2021 13:04:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 08 Aug 2021 13:04:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=VzNhyyDHvtnsV9d2a2A9DcP8GP sueMbCVOTDSYY4h18=; b=T8rBsNFf2cYlpHnEapgNPRkCXjaslB9eWGQuBUG+/Q Erze94zQH3Zisp3TXqG2kNjuhZd+bD8yjZ/T+VU83EihNxKWrXWDjJx5+fZvyD1t jRu8v3pZFrsMHYldvb1AlKpOdpMy6XdJ6vQih4cRvWvl6X6iJVd3KZ73p7Txt/c2 vrICBXK4QPL0FFtQQxB/EtXtW9c1QMbM89/4QGzQ5Mr1PkwQokPltygJ3B+Kunqn 18wPKhVQorZruotYMuUC3+Ey1RtEmNfUlefcxRgZ9M0My6Eepg9nbczvdcUuQ9lH ANKgEc7MRb08EBA9GzT0uRMIZljkuk0ZrtN4v0yVYPVA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=VzNhyyDHvtnsV9d2a 2A9DcP8GPsueMbCVOTDSYY4h18=; b=uomiY8iAxJrrFmfdJASh1o3FP7f4TdpXu DIMY9iLAgaJ0aDgX5hKt88Q9q7pe0sWdybk7VAXXMF6fvE7sbSBtvi+/OhmmpZEU 6sgt7ot3To4wX6D/DMbDriVwXVOf703tZTivS+7W9c/7LqPSvJ/M9/rZMazhiuYW W8Ie6BR2yxUxUEPgSlWgj4+w5bgWTGzqaNQvU2/6IJdbXLso1q92EFeIi97mF+bJ sDVOGq5uEuKBFmeUS65pVNMNW4Io3eXlDjw4oSA5haaRJBFjrIYhk5eeRSgVOdMc YUg1D/g+LDfWyzOsRaqFqn4D13697PkylNXamd0MbGrESfr/MxcnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrjeehgddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephedvfffghfetieejgfetfedtgffhvdehueehvdejudfgge fgleejgfelfeevgfefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 8 Aug 2021 13:04:47 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 1CA204E2; Sun, 8 Aug 2021 17:04:46 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs] spectrumPackages: update execline backtick uses Date: Sun, 8 Aug 2021 17:04:39 +0000 Message-Id: <20210808170439.1372425-1-hi@alyssa.is> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 5NDXOZDQ6W36TCTQAS6K4DH36KNQB4QA X-Message-ID-Hash: 5NDXOZDQ6W36TCTQAS6K4DH36KNQB4QA X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.4 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: execline 2.8.0.0 changed how backtick's options work: * -i (exit with the program's error code on failure) and -n (chomp off a trailing newline from the captured output) are now the defaults. * -E has been introduced, which does importas automatically. -E is fantastic, because we followed every single use of backtick with importas. Even we didn't have -n before, it's okay that chomping will now be enabled from the default, because in all those cases, there won't be a trailing newline anyway. --- .../linux/spectrum/testhost/default.nix | 14 ++++---------- pkgs/os-specific/linux/spectrum/vm/app/default.nix | 3 +-- pkgs/os-specific/linux/spectrum/vm/net/default.nix | 6 ++---- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/testhost/default.nix b/pkgs/os-specific/linux/spectrum/testhost/default.nix index de62f0add67..d81ff8b826e 100644 --- a/pkgs/os-specific/linux/spectrum/testhost/default.nix +++ b/pkgs/os-specific/linux/spectrum/testhost/default.nix @@ -52,18 +52,14 @@ let # routers from clients. Other bits are reserved. # 5-6 Last two octets of client's IP (in 100.64.0.0/16). # - backtick -i router_mac { + backtick -E router_mac { pipeline { printf %.4x ${toString sys-vms.app.vmID} } sed s/^\\(..\\)\\(..\\)$/0A:B3:EC:80:\\1:\\2/ } - backtick -i client_mac { + backtick -E client_mac { pipeline { printf %.4x ${toString sys-vms.app.vmID} } sed s/^\\(..\\)\\(..\\)$/0A:B3:EC:00:\\1:\\2/ } - multisubstitute { - importas -iu router_mac router_mac - importas -iu client_mac client_mac - } # Create the net VM end, and attach it to the net VM. # @@ -143,12 +139,11 @@ let # is allowed to fail because it might already know that, in # which case it'll return EEXIST. if { modprobe vfio-pci } - backtick -in device_id { + backtick -E device_id { if { dd bs=2 skip=1 count=2 status=none if=''${PCI_PATH}/vendor } if { printf " " } dd bs=2 skip=1 count=2 status=none if=''${PCI_PATH}/device } - importas -iu device_id device_id foreground { redirfd -w 1 /sys/bus/pci/drivers/vfio-pci/new_id printf "%s" $device_id @@ -205,8 +200,7 @@ writeScriptBin "spectrum-testhost" '' if { redirfd -w 1 /proc/sys/net/ipv4/ip_forward echo 1 } importas -iu runtime_dir XDG_RUNTIME_DIR - backtick -in TOP { mktemp -dp $runtime_dir spectrum.XXXXXXXXXX } - importas -iu top TOP + backtick -E top { mktemp -dp $runtime_dir spectrum.XXXXXXXXXX } if { echo $top } if { rsync -r --chmod=Du+w ${servicesDir}/ ''${top}/service } background { diff --git a/pkgs/os-specific/linux/spectrum/vm/app/default.nix b/pkgs/os-specific/linux/spectrum/vm/app/default.nix index f8ff480932c..9ffed7e5b13 100644 --- a/pkgs/os-specific/linux/spectrum/vm/app/default.nix +++ b/pkgs/os-specific/linux/spectrum/vm/app/default.nix @@ -26,12 +26,11 @@ runCommand "vm-app" rec { oneshot ''; up = writeText "net-up" '' - backtick -i LOCAL_IP { + backtick -E LOCAL_IP { pipeline { ip -j link show eth0 } pipeline { jq -r ".[0].address | split(\":\") | .[4:6] | \"0x\" + .[]" } xargs printf "100.64.%d.%d" } - importas -iu LOCAL_IP LOCAL_IP if { ip address add ''${LOCAL_IP}/32 dev eth0 } if { ip link set eth0 up } diff --git a/pkgs/os-specific/linux/spectrum/vm/net/default.nix b/pkgs/os-specific/linux/spectrum/vm/net/default.nix index 5921b62fcf7..75c86b8f92c 100644 --- a/pkgs/os-specific/linux/spectrum/vm/net/default.nix +++ b/pkgs/os-specific/linux/spectrum/vm/net/default.nix @@ -54,12 +54,11 @@ runCommand "vm-net" rec { # Our IP is encoded in the NIC-specific portion of the # interface's MAC address. - backtick -i CLIENT_IP { + backtick -E CLIENT_IP { pipeline { ip -j link show $INTERFACE } pipeline { jq -r ".[0].address | split(\":\") | .[4:6] | \"0x\" + .[]" } xargs printf "100.64.%d.%d" } - importas -iu CLIENT_IP CLIENT_IP if { ip address add 169.254.0.1/32 dev $INTERFACE } if { ip link set $INTERFACE up } @@ -121,7 +120,7 @@ runCommand "vm-net" rec { ''; run = writeScript "connman-run" '' #! ${execline}/bin/execlineb -S0 - backtick -in HARDWARE_INTERFACES { + backtick -E HARDWARE_INTERFACES { pipeline { find -L /sys/class/net -mindepth 2 -maxdepth 2 -name address -print0 } @@ -132,7 +131,6 @@ runCommand "vm-net" rec { # Extract the interface names from the address file paths. awk -F/ "{if (NR > 1) printf \",\"; printf \"%s\", $5}" } - importas -iu HARDWARE_INTERFACES HARDWARE_INTERFACES ${connman}/bin/connmand -ni $HARDWARE_INTERFACES ''; base-commit: d2e147bedf251976ed99b94b6c905d6761f7a892 -- 2.32.0