From nobody Wed Sep 23 18:36:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hqm056v5Sz6tS8w for ; Wed, 23 Sep 2026 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hqm055n5hz4tqT for ; Wed, 23 Sep 2026 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790188613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wt52JgYyZ7crl5tCZFBVW2UzF92KZyN/BRCqlfJoNSk=; b=dgPsrwubaHJSPJ/Oo4PeEcwzSEV/2eUeX5LumYUHC+j1mQPSC1En+7E7p7lirjs6M82pBq 5rFW0k9O30YRYAxWCx06zWa0kzkeRZQ1fjEFhUYVEn/8/cLR6PtJU5t4p+HIAv6unaXhz8 reiIFIu8VuEsoXBEtq1w8dyrM3zNKRYfFszuSR00nYPxilEyc6v4MGVY8wol7djqaKnHnj OTjbCDVbUvQeNQPP5RLJtXPPjiixLqYd45zjVRfa7AhWNewFVnFkfZgP2NrjBYgyB1VYHo 7dVL4bhqUd8lR28a9tmGJfmKXSH8yVHfVthq07maO7Z7dnLJrPLDjHBcc7xlOg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790188613; b=aLZzG9+/d/x9x38F5KvOXtiKquQ+9XtZRwon8oJVuWAoCMHLEY0dOmmunPwzp3p313S+me fZP/fYSGGcAeH1ZE+YKuKWCbY2JqHxSX/6pCKvf4SWEvUygEhF8JEX0xLvcET8jtI5FBfZ oRami9JAmMqKzJ6PR2jMmpe2nvKWT8OAbLxp2j0Dc8ZCLaCqJbrheg+q2e6yBcLBcDrrdv BWN2lzAbeezbFEwHjEyPjmu/YL2ME4DSJqj5qMKXuxeb4M/9IRwYX7K9cpYbWK85QYvW41 q85LaGR0t47GtFM1d1zEoSU6YjraDdNS99fJUWIc1cpo2yXV5OFSObhGzfgSuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790188613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wt52JgYyZ7crl5tCZFBVW2UzF92KZyN/BRCqlfJoNSk=; b=tCCLyJFh/oVxcNJDD6X2Nrha0nkwBHVnyDHhtp19X7C5mgzmaVvRViohtl9a/6YzDdq3IJ bOiCZ6QFjO3+lfE9pxpV4VShANj8NJ9zzfX7zV5fcIx9PUdXA/cVq/XGFE0dRgQEf5xMT/ JP8q89Roht1X7GfOyI2fVI7RQ68scfwNLrs4fc7pD/iNT64Xt9hnqrvT5RoGuwm8sNUmpP G7f6/svHhhMbmRZ6OXyqlxn2cL+4w8huTz/cUAUtFn4Dxecsn1QOBwhVMhUm70Wk63osC+ Frsq+EIMakkO+HmZ8h2lRwjjwXYPQjaGybhifUYOG4Aq0RjQ3nc4ZxQ0loA4Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hqm054M9mz14Yq for ; Wed, 23 Sep 2026 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23958 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 23 Sep 2026 18:36:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: fb039d41f2b4 - stable/15 - ec2-desktop: Fix shell expansion in ec2_setpass List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fb039d41f2b4be53a15cce79259486ba1f7c5b76 Auto-Submitted: auto-generated Date: Wed, 23 Sep 2026 18:36:53 +0000 Message-Id: <6ab41c45.23958.3dbb6f32@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fb039d41f2b4be53a15cce79259486ba1f7c5b76 commit fb039d41f2b4be53a15cce79259486ba1f7c5b76 Author: Colin Percival AuthorDate: 2026-09-19 23:53:15 +0000 Commit: Colin Percival CommitDate: 2026-09-23 18:36:28 +0000 ec2-desktop: Fix shell expansion in ec2_setpass Using a backtick inside a backtick-expansion isn't a good idea; switch instead to using $( ... ). Fixes: a9710349513f ("EC2: Add desktop flavour") Sponsored by: Amazon (cherry picked from commit 28cad382a2bb5fc398bd11f8e7b3637ad6c03334) --- release/tools/ec2_setpass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/ec2_setpass b/release/tools/ec2_setpass index 6bc5a73dc33b..cd3324a58ebb 100644 --- a/release/tools/ec2_setpass +++ b/release/tools/ec2_setpass @@ -43,7 +43,7 @@ ec2_setpass_run() # Set a random password, and print it in encrypted format PUBKEY=$(mktemp -t ec2_setpass) ssh-keygen -e -m PKCS8 -f ${SSHKEYFILE} > ${PUBKEY} - PASSWD=`jot -cr 16 / z | tr '\\`' '-+' | rs -g 0` + PASSWD=$(jot -cr 16 / z | tr '\\`' '-+' | rs -g 0) echo "${PASSWD}" | pw usermod ${ec2_fetchkey_user} -h 0 echo "Username: ${ec2_fetchkey_user}" echo "Password: "