From nobody Thu Apr 17 14:59:42 2025 X-Original-To: dev-commits-src-main@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 4ZdgzM3TWnz5tHCG; Thu, 17 Apr 2025 14:59:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdgzM2KMxz3qSL; Thu, 17 Apr 2025 14:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744901983; 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=ubik+UOPsLv/EDcbtd6C0uK1lx7urpcUKgptUQQA6kI=; b=Nof3OIkwVcNpXvIeAxbbk3CcSs3fyWGwnBAeqFj/3ZpoDK5rDDSBCsbGaYodwJKSzvvC1y S/HpXb74GK6Py40Lh5tYYM2/FzMYkej9TrAUm66mmxo/nJBU7k+ZIZryZLDO9TW9p0gz3m xYpypW0C/yEWAaATlQq6jAXVauDPfUWGekS6fYt73d59wawtYsAklpuuORWd+zi0auqX+m v/67AAx2+ZKi3Z5HA1GuBOsEhG1D5pCeFWCNcA4wYZQqvoyOemc8/krmJR/Qg6n53BwNhJ xoL3jVgLK8FjkV8gL9aqwHAJbSTG105vBfFR5v8PwiQb+IwZSf0XcVoDvS7j9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744901983; a=rsa-sha256; cv=none; b=iGIdIYh81k8kzcEXhoUnfJbKKqVkwEU3cYIG/UuNp5o/ZRpheRhc+JOwf3YRyd/0AC1y+k 8jRQidUVngHpC35BlNIwJU/zLe34/5XRHrVQJOtBaoGDYZb/CkLMc+m7Yph2gwm7k6/Nne 5BQgno8wFbzgliZzdB6J9wqDzLMcUkZkSPiu9pwaDHhymdFj1bps6w+z3KFTui9GGxk2/b EHlxFZRou1EJpNkKGwyr8BvDlmgmFTCJV09vUQDKqxxgfAM/eDgzlxUIshY5BS/wYR6zOg kF7aRbwZwSFcpN8LzHwXcDDlySxlKFJbVKVMmTjCN2vwxLYNqzdLsqS4CPtqmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744901983; 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=ubik+UOPsLv/EDcbtd6C0uK1lx7urpcUKgptUQQA6kI=; b=t2m2aRz0RRC2ma21JmcrtVmJqHRvkjRuXdBindaTV23KgHT01ZHO6w0S0JGPhhFU0JHtkg JdEup0mcB+HZvvrzQ4O1WN0GiPO07M5axmSzxspRhe4hArTNzegq7U4gbrjk7c0Vg5eKmY SJvBrCYJL5+sh0xcTz6XCLFfaSE66fqlIqmCKIGuJyFdHU5Rjn5n3YcgAppv60PD7bG6nx HXJXdg/aICJ1Q2ViUjRQoFhM64utd6ALhqg1vnS8JGkvntS27V523yuZ8qmRE9fQGxuooI u73DivKJFa96ijV7XfRrbpv77tXk/KWqv9eZENA9VK92cjIjD6s/sAVRo6mjkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZdgzM0b3Zzt8H; Thu, 17 Apr 2025 14:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53HExgun017467; Thu, 17 Apr 2025 14:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HExgdA017464; Thu, 17 Apr 2025 14:59:42 GMT (envelope-from git) Date: Thu, 17 Apr 2025 14:59:42 GMT Message-Id: <202504171459.53HExgdA017464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Reifenberger Subject: git: 6ebab5e6bbec - main - Use ln -sf otherwise nanobsd.sh -wkWK fails since the etc link exists already. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ebab5e6bbecdc70fb85d81f046267423f5a67b8 Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/src/commit/?id=6ebab5e6bbecdc70fb85d81f046267423f5a67b8 commit 6ebab5e6bbecdc70fb85d81f046267423f5a67b8 Author: Michael Reifenberger AuthorDate: 2025-04-17 11:03:54 +0000 Commit: Michael Reifenberger CommitDate: 2025-04-17 14:59:15 +0000 Use ln -sf otherwise nanobsd.sh -wkWK fails since the etc link exists already. Before creating the nanobsd image nanobsd.sh creates a soft link for usr/local/etc in the function setup_nanobsd() This fails if the link already exists (when using nanobsd.sh -wkWK) Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D49873 --- tools/tools/nanobsd/defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 4ba35ffeb04d..65bace957f71 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -538,7 +538,7 @@ setup_nanobsd ( ) ( # are installed by this point, but are later in the process, # the symlink not being here causes problems. It never hurts # to have the symlink in error though. - ln -s ../../etc/local usr/local/etc + ln -sf ../../etc/local usr/local/etc for d in var etc do