Re: "etcupdate -p" vs. $OLDTREE?

On 4/23/21 6:59 AM, Olivier Cochard-Labbé wrote:
> On Fri, Apr 23, 2021 at 1:10 PM David Wolfskill <david_at_catwhisker.org>
> wrote:
> 
>> After the set of updates to etcupdate (main-n246232-0611aec3cf3a ..
>> main-n246235-ba30215ae0ef), I find that "etcupdate -B -p" is working as
>> expected, but after the following "make installworld", a subsequent
>> "etcupdate -B" chugs along for a bit, then stops, whining:
>>
>> No previous tree to compare against, a sane comparison is not possible.
>>
>>
>>
> Same problem here while using /usr/src/tools/build/beinstall.sh:
> (...)
> Skipping blacklisted certificate
> /usr/share/certs/trusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
> (/etc/ssl[0/1831]sted/ee1365c0.0)
> Skipping blacklisted certificate
> /usr/share/certs/trusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
> (/etc/ssl/blacklisted/dc45b0bd.0)
> Scanning /usr/local/share/certs for certificates...
> + [ -n etcupdate ]
> + update_etcupdate
> + /usr/src/usr.sbin/etcupdate/etcupdate.sh -s /usr/src -D
> /tmp/beinstall.MZ4oy8/mnt -F
> No previous tree to compare against, a sane comparison is not possible.
> + return 1
> + [ 1 -ne 0 ]
> + errx 'etcupdate (post-world) failed!'
> + cleanup
> (...)

Sorry, this should be fixed.  beinstall.sh still has a bug in that it needs this change:

diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 46c65d87e61a..fab21edc0fd5 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
_at__at_ -133,7 +133,7 _at__at_ update_mergemaster() {
  
  update_etcupdate_pre() {
         ${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
-       ${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $?
+       ${ETCUPDATE_CMD} resolve -p -D ${BE_MNTPT} || return $?
  }
  
  update_etcupdate() {
                                                                                 


-- 
John Baldwin