Re: how to use etcupdate?

$B@DLZ!wL>8E20$5$s(B
  $BOBKcO$$G$9(B

$BAaB.$N=u8@$"$j$,$H$&$4$6$$$^$9!#(B

handbook 26.6$B@a$rMWLs$9$k$H(B
  $B8E$$(Bsource tree# etcupdate extract
$B?7$7$$(Bsource tree# make installkernel
  reboot
$B?7$7$$(Bsource tree# etcupdate -p
$B?7$7$$(Bsource tree# make installworld
$B?7$7$$(Bsource tree# etcupdate -B
  reboot
$B$H$$$&$h$&$K8+$($^$9$,!"=u8@D:$$$?$N$@$H!"(Betcupdate$B$N(B-B option$B$r$D$1$k(B
$B$N$,(Betcupdate extract$B$NJ}$G!"K\HV(B(?)$B$NJ}$G$O!"$J$7!"$H$$$&$3$H$G$7$g$&(B
$B$+!#(B

etcupdate$B$N(Bonline manual$B$r8+$F$b%$%^%$%A(B-B option$B$N5sF0$,$o$+$C$F$$$J(B
$B$$$N$G5$$K$J$C$F$$$^$9!#(B

$B$b$&0lE@!"(Bgit clone$B$G(B/usr/src$B$r<h$C$F$-$?$N$G$9$,!"(BFreeBSD ID string$B$H(B
$B;W$o$l$k$b$N$,(B
  $FreeBSD$
$B$H$$$&$h$&$K=q$$$F$"$j!"(B
  $FreeBSD: releng/12.4/etc/login.access 130151 2004-06-06 11:46:29Z schweikh $
$B$H$$$C$?7A<0$h$jC;$$$N$,5$$K$J$C$F$$$F!"$3$l$,(B-F option$B$r$D$1$?;~$K0-(B
$B$5$r$7$F$$$k$N$+$J$!$H;W$C$?$j$b$7$F$$$^$9!#(B

varmfs$B$O;H$C$F$^$;$s!#$?$@!"(B/var/db/etcupdate$B$NB8:_$K$O5$$,$D$$$?$N$G(B
$B$9$,!"$=$3$r8+$F$b0JA0$N(B/etc$B$O8+Ev$?$j$^$;$s$G$7$?!#(B

$B$J$*!"(Bvi$B$O$"$s$^$jF@0U$G$O$"$j$^$;$s$,;H$($^$9$7!"(B3-way merge$B$b(B30$BG/$[(B
$B$IA0$K$J$j$^$9$,!"(BPVCS$B$H$+$$$&46$8$NL>A0$N$b$N$r;H$C$?$3$H$,$"$k$N$G$o(B
$B$+$j$^$9$N$GBg>fIW$G$9!#(B

$B$?$@!"(Betcupdate$B$G!V(BC$B!W$D$-$N$,=P$F$-$?;~$,(Bconflict$B$@$H$$$&G'<1$,$J$+$C(B
$B$?$N$G!":G=i$O(Betcupdate resolve$B$rK:$l$F$$$^$7$?$,!"$H$j$"$($:(Betcupdate
$B$N$"$H$K$$$D$G$b(Betcupdate resolve$B$9$l$P!"(Bconflict$B$,$"$m$&$H$J$+$m$&$H(B
$B$&$^$/$$$/$H$$$&M}2r$G$9!#(B

$B@DLZOBKcO$(B


$B!Z0J2<!"A4J80zMQ![(B
From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Subject: Re: how to use etcupdate?
Date: Thu, 11 Jan 2024 18:47:44 +0900

> $B@DLZ(B@$BL>8E20$G$9!#(B
> 
> $B:#99$G$9$,!"4pK\!"(Betcupdate$B$O!"=i$a$F;H$&>l9g!"(B
> $B!!!&(Bsrc$B%D%j!<$N!Z99?7A0![$K(B`etcupdate extract -B`$B$G(B
> $B!!!!Hf3SBP>]MQ$N%D%j!<$r9=C[(B
> $B!!!&(Bsrc$B%D%j!<99?7!&%j%S%k%I!&(B`make installkernel`$B8e!"(B
> $B!!!!(B`etcpudate -p`
> $B!!!&%7%s%0%k%f!<%6$G:F5/F08e!J(BZFS$B4XO"$N99?7$@$H:F5/F0(B
> $B!!!!$;$:(B`shutdown now`$B$G%7%s%0%k%f!<%6$KMn$A$k$@$1$G(B
> $B!!!!=hM}$9$kI,MW$,$"$k%1!<%9$b!K!"(B`make installworld`$B8e!"(B
> $B!!!!(B`etcupdate -B`$B$G;D$j$r99?7!#!!(B`make delete-old`$B$r(B
> $B!!!!$d$k$J$i$=$A$i$r@h$K!#!!(B`make delete-old-libs`$B$O(B
> $B!!!!:G8e$N:G8e!"(Bports$BEy$b4^$a$F8E$$%i%$%V%i%j$r;H$&$b$N$,(B
> $B!!!!2?$bL5$/$J$C$?$H3NG'$G$-$?8e$G!#(B
> 
> $B$G$@$$$?$$$&$^$/$$$-$^$9$,!"(B"C"$B%^!<%/$NIU$$$?%"%$%F%`(B
> $B!J(Bsrc$B$G$NJQ99$H%m!<%+%k@_Dj$G$NJQ99$,>WFM!K$,$"$k$H(B
> $B<jF0$G$N<h<NA*Br$,I,MW$K$J$j$^$9!#!!(Bforums.freebsd.org$B$N(B
> $BJ}$G!"(Broot$B$N(BEDITOR$B4D6-JQ?t$,L$@_Dj$N>l9g$N%G%U%)%k%H$,(Bvi
> $B$@$C$?$3$H$b$"$C$F!"FC$K(Bvi$B$KIT47$l$J?M$?$ACf?4$K0$I!6+4-$N(B
> $BCO9v3(?^$,!#!!(B3ways merge$B$N07$$$,$o$+$i$J$$$N$K2C$($F(Bvi$B$N(B
> $BA`:n$bJ,$+$i$J$$$H$$$&(B2$B=E6l$,L"1d$7$F$^$7$?!#(B
> 
> $BOBKcO$$5$s!J$I$A$i$b@DLZ$GJ6$i$o$7$$$N$G(B(^^;$B!K$N>l9g!"(B
> src$B$N99?7A0!JA0$N(Bsrc$B%D%j!<$r99?7$7$?$s$G$9$h$M!)!K$K(B
> $BHf3SMQ$N%D%j!<$rMQ0U$5$l$F$$$k$h$&$J$N$GLdBj$J$5$=$&$G$9$,!"(B
> $BG0$N0Y!"(Bvarmfs$B4D6-$G$O$"$j$^$;$s$h$M!)(B
> etcupdate$B$O%G%U%)%k%H$G:n6HMQ%G!<%?$r(B/var/db/etcupdate$B0J2<$K(B
> $B9=C[!&J]B8$9$k$N$G!"(Bvarmfs$B$J4D6-$@$H:F5/F0;~$K>CLG$7$F(B
> $B$7$^$$$^$9$N$G!#(B
> 
> $B;d$N>l9g!"(Betcupdate$B$,=i$a$F(Bsrc$B$K<h$j9~$^$l$F$9$0$N99?7$G(B
> $B$$$-$J$j;n$7$F!":G=i$N%9%F%C%W$r1i$C$F$$$J$+$C$?$?$a(B
> $B%I%D%\$KVH$^$C$?7P83$,$"$j$^$9!#!!3N$+!"(Betcupdate$B$N:n6HMQ(B
> $B%G!<%?J]B8@h$rI,;`$KC5$7$F>C5n$7!"0lC6(Bsrc$B%D%j!<$r(Bsvnlite$B$G(B
> $B6/@)E*$K99?7A0$N>uBV$KLa$7$F:G=i$N%9%F%C%W$r$d$jD>$7$F(B
> $B6/0z$K=hM}$7$?$+$H;W$$$^$9!#(B
> 
> 12$B7n$"$?$j$+$i$N(Bforums$B$N4X78$7$=$&$J%9%l%C%I$O$3$NJU$G$7$g$&$+!#(B
> $B$"$/$^$G;d$,2?$i$+$N%"%/%7%g%s$r9T$C$F(BWatched threads$B$K%j%9%H(B
> $B$5$l$kHO0O$G$9$,!#!!3N$+!"$^$@$"$C$?$H;W$$$^$9!#(B
> 
> $B!!(Bhttps://forums.freebsd.org/threads/14-0-release-conflicts-in-etc-passwd-results-in-losing-root.91124/
> 
> $B!!(Bhttps://forums.freebsd.org/threads/14-0-release-upgrade-question-merge-conflict-markers-remain.91079/
> 
> 
> On Thu, 11 Jan 2024 15:00:26 +0900 (JST)
> Kazumaro Aoki <ka@flu.if0.org> wrote:
> 
>> $B@DLZ!wF#Bt;T:_=;$G$9(B
>> 
>> 12R$B$N(BEoL$B$HA08e$7$F$$$/$D$+$N(B12R$B$r(B13R$B$K(Bupgrade$B$7$^$7$?!#(B
>> $B$d$C$F$J$$$@$1$G$O$"$k$N$G$9$,(Bbinary update$B$O7P83$,$J$$$N$G!"(Bsource
>> tree$B$+$i$N(Bmake installworld$B$G$9!#(B
>> 
>> $B$^$?!"(Bmergemaster$B$O(B13R$B$G$J$/$J$C$F(B14R$B$+$i$NI8=`$H$$$&$3$H$b$-$-!"$=$N(B
>> $BN}=,$r7s$M$F(Bhandbook chapter 26.6$B$r8+$J$,$i<B;\$7$^$7$?!#(B
>> 
>> $B$^$:$O!"(B
>>   etcupdate extract
>> $B$7$F!"(Bsource$B$r(Bgit$B$G<h$j$@$7!"(Bmake buildkernel buildworld$B$7$^$7$?!#(B
>> $B<!$K(Bmake installkernel$B$7$F!"(B
>>   etcupdate -F -p
>> $B$r<B9T$7$?$H$3$m(BC$B$D$-$N%U%!%$%k$,=P$?(BPC$B$G$O<!$N(B
>>   etcupdate resolve
>> $B$G=$@5$7$^$7$?!#<!$K(Bmake installworld$B$7$F!"(B
>>   etcupdate -F -B
>> $B$7$?$i!"$+$J$j$N(B/etc$B$N%U%!%$%k$,(B0$B%P%$%H$s$J$C$F$7$^$C$F!":$$C$F$^$9!#(B
>> 
>> handbook$B$NJ}$G$O(Betcupdate$B$N(B-F option$B$O=q$$$F$$$J$+$C$?$N$G$O$"$j$^$9$,!"(B
>> online manual$B$r8+$k8B$j(Bmergemaster$B$HF1$8$h$&$K:n6HIi2Y$r8:$i$7$F$/$l$=(B
>> $B$&$K;W$$$D$1$F$_$^$7$?!#$3$l$,$^$:$+$C$?$N$G$7$g$&$+!)(B
>> 
>> $B@DLZOBKcO$(B @ $BF#Bt;T:_=;(B
>> 
> 
> 
> -- 
> $B@DLZ(B $BCNL@(B  [Tomoaki AOKI]    <junchoon@dec.sakura.ne.jp>