From owner-freebsd-questions@freebsd.org Tue May 4 10:48:22 2021 Return-Path: Delivered-To: freebsd-questions@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4786762CE7B for ; Tue, 4 May 2021 10:48:22 +0000 (UTC) (envelope-from Mathias.Picker@virtual-earth.de) Received: from www94.your-server.de (www94.your-server.de [213.133.104.94]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4FZGln1yhDz4sP3 for ; Tue, 4 May 2021 10:48:20 +0000 (UTC) (envelope-from Mathias.Picker@virtual-earth.de) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtual-earth.de; s=default_1811; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=tQJ3D8x8SplPJe+1F9ufpzSyNajQSwchYmDomRacwio=; b=X26y62OwebwGXsIlv/QahNgycj hEtfeBJSWDre3ld58aKNF3P1SEwz4bjJ7Z+ZyVjXyKw8VrZ0ddQwDezakSkRcGNcWj075Ttm/eFTp YLwdGiQekrS+kDWFEUDAuxKVKoCpmcxF1hU3WSEH4mu4J9izb+R9QarHihhj7xw13W/CLf8Nx9IPQ vQcTJClpwKZi2K5TnL/8wXNTDc1Va1vAb9oQAfZbE3XzLywOw2cap+eBlElo236IKP37EUf49VoZp N5jhDdLMFuEMC6ia/42sRhProle2mephj8ZfasbqVJr35dCkgGR4inydI7A4M86qmASTimykLRbVO FoRpCYRQ==; Received: from sslproxy02.your-server.de ([78.47.166.47]) by www94.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1ldsbC-000GEV-3T for freebsd-questions@freebsd.org; Tue, 04 May 2021 12:48:18 +0200 Received: from [2001:a61:247a:7601:1a1d:eaff:fe16:cc77] (helo=danton.virtual-earth.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ldsbB-00077z-Tg for freebsd-questions@freebsd.org; Tue, 04 May 2021 12:48:18 +0200 User-agent: mu4e 1.2.0; emacs 27.2 From: Mathias Picker To: FreeBSD-QUESTIONS Subject: freebsd-update in jails: merge fails for files that only differ in rcs? Date: Tue, 04 May 2021 12:48:17 +0200 Message-ID: <86tuni6aha.fsf@virtual-earth.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: Mathias.Picker@virtual-earth.de X-Virus-Scanned: Clear (ClamAV 0.103.2/26159/Mon May 3 13:09:38 2021) X-Rspamd-Queue-Id: 4FZGln1yhDz4sP3 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=virtual-earth.de header.s=default_1811 header.b=X26y62Ow; dmarc=pass (policy=none) header.from=virtual-earth.de; spf=pass (mx1.freebsd.org: domain of Mathias.Picker@virtual-earth.de designates 213.133.104.94 as permitted sender) smtp.mailfrom=Mathias.Picker@virtual-earth.de X-Spamd-Result: default: False [-3.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[virtual-earth.de:+]; DMARC_POLICY_ALLOW(-0.50)[virtual-earth.de,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_LOW(-0.10)[213.133.104.94:from]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[213.133.104.94:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[virtual-earth.de:s=default_1811]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[213.133.104.94:from:127.0.2.255]; HAS_X_AS(0.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2021 10:48:22 -0000 Hi all, I=E2=80=99m in the process of updating my servers from 12.2-RELEASE-p6 to 13.0-RELEASE. This worked fine for the host. This now runs=20 13-RELEASE, the jails are still running 12.2 world. For the jais, running - - - - - - - - - freebsd-update -b /path/to/jail --currently-running 12.2-RELEASE=20 -r 13.0-RELEASE upgrade - - - - - - - - - leads to loads of - - - -=20 The following file could not be merged automatically: [some config=20 file] Press Enter to edit this file in vi and resolve the conflicts manually... - - - - - -=20 for files that differ only in rcs line. Before spending more time: does anyone know what=E2=80=99s going on here=20 and has an idea how to fix this. It=E2=80=99s 50+ files per update, that=E2=80=99s a bit too much for 6 jail= s. I already looked through freebsd-update, found the samef function,=20 recreated the 12 and 13 files for csh.login and ran only the samef=20 function: this came up ok, i.e. identified both versions as the=20 same. Where to look next? The jails are vnet jails set up using jails.conf and bsdinstall,=20 updated before using freebsd-update fetch install, which worked=20 fine, connected to the outsinde via an if_bridge and work fine in=20 all other aspects, i.e. pkg -j jail install whatever works fine,=20 as does pkg -j update, and running web apps reachable from the=20 outside, reaching other jails for api calls, everything works=20 fine. Thanks, Mathias --=20 Mathias Picker Gesch=C3=A4ftsf=C3=BChrer Mathias.Picker@virtual-earth.de virtual earth Gesellschaft f=C3=BCr Wissens re/pr=C3=A4 sentation mbH http://www.virtual-earth.de/ Westendstr. 142 80339 M=C3=BCnchen 089 / 1250 3943