From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 16F6C1F4B4; Thu, 17 Dec 2020 19:40:07 +0000 (UTC) Date: Thu, 17 Dec 2020 19:40:06 +0000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 11/9] extsearchidx: improve missing machine-id fallback Message-ID: <20201217194006.GA94292@dcvr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline List-Id: It's likely most GNU/Linux systems have /etc/machine-id these days, so anything missing it is likely a *BSD, most of which support and favor "sysctl -n kern.hostid". We'll also support "ghostid" since GNU utils are commonly prefixed with 'g' on non-GNU platforms. In any case, we'll suppress stderr from missing commands and fall back to hard coding an $OSNAME-based identifier as a last resort and hope the hostname is unique. --- lib/PublicInbox/ExtSearchIdx.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm index f492734a..e196e7ab 100644 --- a/lib/PublicInbox/ExtSearchIdx.pm +++ b/lib/PublicInbox/ExtSearchIdx.pm @@ -534,8 +534,10 @@ sub host_ident () { state $retval = hostname . '-' . do { my $m; # machine-id(5) is systemd if (open(my $fh, '<', '/etc/machine-id')) { $m = <$fh> } - # hostid(1) is in GNU coreutils, kern.hostid is FreeBSD - chomp($m ||= `hostid` || `sysctl -n kern.hostid`); + # (g)hostid(1) is in GNU coreutils, kern.hostid is most BSDs + chomp($m ||= `{ sysctl -n kern.hostid || + hostid || ghostid; } 2>/dev/null` + || "no-machine-id-or-hostid-on-$^O"); $m; }; }