From owner-FreeBSD-users-jp@jp.FreeBSD.org Wed May  1 13:30:48 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g414UmA13126;
	Wed, 1 May 2002 13:30:48 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail.sat.t.u-tokyo.ac.jp (nat.keisu.t.u-tokyo.ac.jp [133.11.68.2])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g414Ul413121
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Wed, 1 May 2002 13:30:47 +0900 (JST)
	(envelope-from simokawa@sat.t.u-tokyo.ac.jp)
Received: from ett.sat.t.u-tokyo.ac.jp (ett.sat.t.u-tokyo.ac.jp [10.6.1.30])
	by mail.sat.t.u-tokyo.ac.jp (Postfix) with ESMTP id 1F02C2DC88
	for <FreeBSD-users-jp@jp.FreeBSD.org>; Wed,  1 May 2002 13:30:43 +0900 (JST)
Date: Wed, 01 May 2002 13:30:43 +0900
Message-ID: <ybsk7qowkuk.wl@ett.sat.t.u-tokyo.ac.jp>
From: Hidetoshi Shimokawa <simokawa@sat.t.u-tokyo.ac.jp>
To: FreeBSD-users-jp@jp.FreeBSD.org
In-Reply-To: <91304.1020220383@ideon.st.ryukoku.ac.jp>
References: <20020501015922.GA52376%ginga-freebsd@ginganet.org>
	<20020430204311.3b42583f.numa@numazaki.org>
	<020501102722.M0101569@mistral.imasy.or.jp>
	<91304.1020220383@ideon.st.ryukoku.ac.jp>
User-Agent: Wanderlust/2.9.9 (Unchained Melody) REMI/1.14.3 (Matsudai)
 FLIM/1.14.3 (=?ISO-8859-1?Q?Unebigory=F2mae?=) APEL/10.3 MULE XEmacs/21.2
 (beta19) (Shinjuku) (i386-unknown-freebsd3.2)
X-Face: OE([KxWyJI0r[R~S/>7ia}SJ)i%a,$-9%7{*yihQk|]gl}2p#"oXmX/fT}Bn7:#j7i14gu$
 jgR\S*&C3R/pJX<mI-4Z8'mqt1R'CjWdw-xqVoilv`\JgZcquM5oVuO^<vt/~051rCDM(`{rM~?{Ok
 r,XC+}Ycm9IJO)odT*-0nyJjBJYzL{GsZ
MIME-Version: 1.0 (generated by REMI 1.14.3 - "Matsudai")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+020417
X-Sequence: FreeBSD-users-jp 68298
Subject: [FreeBSD-users-jp 68298] Re: mergemaster (was Re: stable
 =?ISO-2022-JP?B?GyRCJD0kTjhlGyhC?=
 )
Errors-To: owner-FreeBSD-users-jp@jp.FreeBSD.org
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: simokawa@sat.t.u-tokyo.ac.jp

At Wed, 01 May 2002 11:33:03 +0900,
KOJIMA Hajime / $B>.EgH%(B wrote:
> 
>   RELEASE $B$7$+;H$o$J$$?M$J$N$G$9$,!"(B
> 
> $BBjL>(B: [FreeBSD-users-jp 68289] Re: stable $B$=$N8e(B 
> (<20020501015922.GA52376%ginga-freebsd@ginganet.org>) $B$K$*$$$F(B
> Kawaguti Ginga $B$5$s$,$*$C$7$c$k$K$O(B:
> | >   $B:G8e$K(B mergemaster $B$G(B /etc$BEy$K$"$k%U%!%$%k$N99?7$b9T$$$^$9!#(B
> | > $B!!$+$J$j=EMW$G$9!#(B
> | 
> | $B3'$5$s(B mergemaster $B$C$FI,$:$d$i$l$F$^$9$G$7$g$&$+(B?
>  
>   $B;H$C$F$^$;$s!#(B 
>  
> | mergemaster $B$7$J$/$F$$$$$h!$$H<gD%$9$k$D$b$j$OLSF,$"$j$^$;$s$,!$(B
> | $B$"$l$C$F(B($B;H$$J}$rNI$/J,$+$C$F$$$J$$$;$$$+(B)$B7k9=J,$+$j$E$i$/$F!$(B
> | $B<+J,$GJQ99$7$?%U%!%$%k$K4X$7$F$O$&$C$+$j>C$7$F$7$^$$$=$&$K(B
> | $B$J$C$?$j$9$k$s$G$4$/$?$^$K$7$+$d$C$F$J$$$G$9!%(B
> 
>   $B$?$H$($P(B 4.4-RELEASE $B$+$i(B 4.5-RELEASE $B$K0\$k$H$-$K$O!"(Bupgrade
>   install $B$7$?$"$H$G!"$3$s$J%9%/%j%W%H$rAv$i$;$?$j$7$F$^$9!#(B
>   FILES $B$K$O!"<+J,$GJQ99$7$F$$$J$$%U%!%$%k$r=q$$$F$*$-$^$9!#(B

$B3N$+$K$H$C$D$-$K$/$$(B interface $B$G$9$,(B, $B$^$"(B shell script $B$G=q$$$?(B
$B$i$"$s$J$b$N$+$J$H;W$C$FJXMx$K;H$C$F$^$9(B.

$B;d$O(B interface $B$h$j$b(B, $B$I$&$G$bNI$$(B file $B$r$$$A$$$AJ9$+$l$?$j(B, update
$B$9$kI,MW$N$J$$(B file $B$rKh2sJ9$+$l$?$j$9$k$H(B, $B$@$s$@$s=8CfNO$,$J$/$J$C$F(B
$B%_%9$7$=$&$G62$$$G$9(B.

$B:#$O(B $B$3$s$J(B wrapper $B;H$C$F$^$9(B.

-------
#!/bin/sh
# $Id: mergemaster_fast,v 1.6 2002/05/01 03:18:43 simokawa Exp $

TEMPROOT=/var/tmp/temproot
BACKUP=/root/etc-backup.tar.gz

if [ -d /conf/CVS ]; then
	(cd /conf; update -PdA)
fi

# backup /etc
(cd /; tar czvf $BACKUP etc)
chmod 600 $BACKUP

# run mergemaster in auto mode
/usr/sbin/mergemaster -a -t $TEMPROOT

#
# auto update files
#
for i in isdn periodic defaults mtree pam.d\
	rc rc.atm rc.devfs rc.firewall rc.firewall6 rc.i386 rc.isdn \
	rc.network rc.network6 rc.pccard rc.resume rc.shutdown \
	rc.suspend rc.syscons gnats
do
	echo Copying etc/$i
	cp -pr $TEMPROOT/etc/$i /etc
	rm -r $TEMPROOT/etc/$i
done

#
# ignore files
#
for i in printcap mail/sendmail.cf passwd master.passwd inetd.conf
do
	echo Removing $TEMPROOT/etc/$i
	rm -r $TEMPROOT/etc/$i
done

/usr/sbin/mergemaster -r -t $TEMPROOT

------


$B$*$^$1(B: kernel config file $B$K(B GENERIC $B$NJQ99$r(B merge $B$9$k(B script
"update-to-generic MYKERNEL" $B$N$h$&$K;H$$$^$9(B.

-----
#!/bin/sh
# $Id: update-to-generic,v 1.15 2002/05/01 03:18:16 simokawa Exp $

usefetch=0

case $1 in
-f)
	usefetch=1
	shift
esac

if [ "X$1" = "X" ]; then
	echo "Please specify config file name"
	exit 1
fi
#target=`hostname | sed -e 's/\..*//' | tr "a-z" "A-Z"`
target=$1
source=GENERIC
arch=`uname -m`
url="http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/$arch/conf/GENERIC"

oldrev=`sed -ne 's/.*GENERIC,v \([0-9\.]*\).*/\1/p' $target`

if [ $usefetch -eq 1 -o ! -d CVS ];  then
	echo fetch -o $source.tmp.$oldrev "$url?rev=$oldrev"
	fetch -o $source.tmp.$oldrev "$url?rev=$oldrev" || exit 1
else
	echo cvs update -pr $oldrev $source
	cvs -R update -pr $oldrev $source > $source.tmp.$oldrev
fi

mv $target $target.old
echo "diff3 -E -m $target.old $source.tmp.$oldrev $source >$target"
diff3 -E -m $target.old $source.tmp.$oldrev $source >$target
rm $source.tmp.$oldrev

diff -u $target.old $target

-------

/\ Hidetoshi Shimokawa
\/  simokawa@sat.t.u-tokyo.ac.jp
PGP public key: http://www.sat.t.u-tokyo.ac.jp/~simokawa/pgp.html
