1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
|
#!/bin/sh
#
# $NetBSD: etcupdate,v 1.28 2006/02/26 19:56:51 apb Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
# by Martti Kuparinen.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
# must display the following acknowledgement:
# This product includes software developed by the NetBSD
# Foundation, Inc. and its contributors.
# 4. Neither the name of The NetBSD Foundation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
#
# This script helps you to update the configuration files in /etc
# after an operating system upgrade. Instead of running "make distribution"
# in /usr/src/etc (and losing your current configuration) you can easily
# see the modifications and either install the new version or merge the
# changes in to your current configuration files.
#
# This script was written by Martti Kuparinen <martti@NetBSD.org> and
# improved by several other NetBSD users.
#
# The idea for this script (including code fragments, variable names etc.)
# came from the FreeBSD mergemaster (by Douglas Barton).
#
PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}"
# Default settings
TEMPROOT="${TEMPROOT:=/tmp/temproot}"
PAGER="${PAGER:=/usr/bin/more}"
SWIDTH=`stty -a | awk '/columns/{w=$6}END{if(w==0){w=80}print w}'`
WIDTH="${WIDTH:=${SWIDTH}}"
DIFF_COMMAND="diff -u"
VERBOSE=false
CONTINUE=false
SOURCEMODE=false # true for "-s source_dir"
SRCDIR= # directory for SOURCEMODE
BINARYMODE=false # true for both BINARYDIRMODE and BINARYTGZMODE
BINARYDIRMODE=false # true for "-s extracted_dir"
BINARYDIR= # directory name for BINARYDIRMODE
BINARYTGZMODE=false # true for "-s etc.tgz"
TGZLIST= # colon-separated list for BINARYTGZMODE
AUTOMATIC=false
LOCALSKIP=false
MACHINE="${MACHINE:=`uname -m`}"
export MACHINE
MACHINE_ARCH="${MACHINE_ARCH:=`uname -p`}"
export MACHINE_ARCH
# Settings for post-installation procedures
NEED_MTREE=false
NEED_MAKEDEV=false
NEED_NEWALIASES=false
NEED_PWD_MKDB=false
myname="${0##*/}"
usage() {
cat << EOF
Usage: ${myname} [options]
Options:
-p pager Which pager to use (default: /usr/bin/more)
-s {srcdir|tgzfile|tempdir} (default: /usr/src)
Location of the source files used to populate the
target directory. This may be any of the following:
* A directory that contains a NetBSD source tree;
* A distribution set file such as "etc.tgz" or "xetc.tgz";
* A temporary directory in which one or both of "etc.tgz"
and "xetc.tgz" have been extracted.
-t temproot Where to store temporary files (default: /tmp/temproot)
-w width Screen width (default: 80)
-a Automatically update unmodified files
-l Automatically skip files with strictly local changes
(this option has no effect on files lacking RCS Ids)
-h This help text
-v Be more verbose
EOF
exit 1
}
verbose() {
# $* = message to display if in verbose mode
${VERBOSE} && echo "${*}"
}
yesno() {
# $* = message to display
echo -n "${*}? (y/[n]) "
read ANSWER
case "${ANSWER}" in
y|Y)
return 0
;;
*)
return 1
;;
esac
}
install_dir() {
# $1 = target directory
if yesno "Create ${1}"; then
verbose "Creating ${1}"
mkdir -p "${1}" || exit 1
NEED_MTREE=true
fi
}
install_file() {
# $1 = target file
# Install the new file
verbose "Installing ${1}"
cp -p "${TEMPROOT}${1}" "${1}" && rm -f "${TEMPROOT}${1}"
# Check if this was a special file
case "${1}" in
/dev/MAKEDEV)
NEED_MAKEDEV=true
;;
/dev/MAKEDEV.local)
NEED_MAKEDEV=true
;;
/etc/mail/aliases)
NEED_NEWALIASES=true
;;
/etc/master.passwd)
NEED_PWD_MKDB=true
;;
esac
}
install_checksum() {
# $1 = target file
${AUTOMATIC} || return
D=`dirname "${1}"`
mkdir -p "/var/etcupdate/${D}"
md5 "${1}" > "/var/etcupdate/${1}"
}
# Initialise the DIFF_EXTRA_OPTIONS variable.
init_diff_extra_options() {
#
# Start with a few options that are always available.
#
DIFF_EXTRA_OPTIONS=\
" su Show differences in unified format (\"diff -u\")
sc Show differences in context format (\"diff -c\")
ss Show differences side by side (\"sdiff -w${WIDTH}\")"
#
# wdiff is not part of the base system, but the
# user might have installed it from pkgsrc. It is
# useful to show differences on a word by word basis
# instead of line by line. If it is executable
# then offer to use it in the menu.
#
if (wdiff /dev/null /dev/null) >/dev/null 2>&1 ; then
DIFF_EXTRA_OPTIONS="${DIFF_EXTRA_OPTIONS}
sw Show differences word by word (\"wdiff -n -l\")"
fi
#
# End with an option to use a user-specified diff-like command.
#
DIFF_EXTRA_OPTIONS="${DIFF_EXTRA_OPTIONS}
scommand Show differences using the specified diff-like command"
}
diff_and_merge_file() {
# $1 = target file
if cmp -s "${TEMPROOT}${1}" "${1}"; then
verbose "===> ${1} (ok)"
rm -f "${TEMPROOT}${1}"
install_checksum "${1}"
return
fi
if ${AUTOMATIC} && [ -f "/var/etcupdate/${1}" ]; then
SUM1=`md5 "${1}"`
SUM2=`cat "/var/etcupdate/${1}"`
if [ "${SUM1}" = "${SUM2}" ]; then
install_file "${1}"
install_checksum "${1}"
return
fi
fi
if ${LOCALSKIP}; then
ID1=`ident -q "${TEMPROOT}${1}" | sed -n 2p`
ID1="${ID1:-0}"
ID2=`ident -q "${1}" | sed -n 2p`
ID2="${ID2:-1}"
if [ "${ID1}" = "${ID2}" ]; then
verbose "===> ${1} (ok:RCS)"
rm -f "${TEMPROOT}${1}"
return
fi
fi
clear
if [ ! -f "${1}" ]; then
verbose "===> ${1} (missing)"
DOES_EXIST=false
else
verbose "===> ${1} (modified)"
verbose ""
DOES_EXIST=true
diff -u "${1}" "${TEMPROOT}${1}" | ${PAGER}
fi
STAY_HERE=true
ALREADY_MERGED=false
# Determine name for the backup file (/foo/._etcupdate.bar)
D=`dirname "${TEMPROOT}${1}"`
F=`basename "${TEMPROOT}${1}"`
B="${D}/.etcupdate.${F}"
F="${D}/${F}"
while ${STAY_HERE}; do
# Ask the user if (s)he wants to install the new
# version or perform a more complicated manual work.
echo ""
echo -n "File: ${1}"
if [ ! -f "${1}" ]; then
echo -n " (missing)"
else
echo -n " (modified)"
fi
echo ""
echo ""
echo "Please select one of the following operations:"
echo ""
if ! ${DOES_EXIST}; then
cat << EOF
d Don't install the missing file
i Install the missing file
v Show the missing file
EOF
elif ! ${ALREADY_MERGED}; then
cat << EOF
d Don't install the new file (keep your old file)
i Install the new file (overwrites your local modifications!)
m Merge the currently installed and new files
s Show the differences between the currently installed and new files
${DIFF_EXTRA_OPTIONS}
v Show the new file
EOF
else
cat << EOF
d Don't install the merged file (keep your old file)
i Install the merged file (overwrites your old file)
m Merge again (your old file against the result from the previous merge)
s Show the differences between the currently installed and new merged files
${DIFF_EXTRA_OPTIONS}
u Undo merge (start again with the original version of the new file)
v Show the merged file
EOF
fi
echo -n "What do you want to do? [Leave it for later] "
read ANSWER
case "${ANSWER}" in
[dD])
verbose "Removing ${TEMPROOT}${1}"
rm -f "${TEMPROOT}${1}"
STAY_HERE=false
;;
[iI])
install_file "${1}"
if ! ${ALREADY_MERGED}; then
install_checksum "${1}"
fi
STAY_HERE=false
;;
[mM])
${DOES_EXIST} || continue
[ ! -f "${B}" ] && cp "${F}" "${B}"
cp "${TEMPROOT}${1}" "${TEMPROOT}${1}.merged"
sdiff -o "${TEMPROOT}${1}.merged" \
--width=${WIDTH} \
--suppress-common-lines --text \
"${1}" "${TEMPROOT}${1}"
mv -f "${TEMPROOT}${1}.merged" "${TEMPROOT}${1}"
ALREADY_MERGED=true
;;
[sS]*)
${DOES_EXIST} || continue
case "${ANSWER}" in
[sS]) : no change ;;
[sS]u) DIFF_COMMAND="diff -u" ;;
[sS]c) DIFF_COMMAND="diff -c" ;;
[sS]s) DIFF_COMMAND="sdiff -w${WIDTH}" ;;
[sS]w) DIFF_COMMAND="wdiff -n -l" ;;
[sS]*) DIFF_COMMAND="${ANSWER#?}" ;;
esac
${DIFF_COMMAND} "${1}" "${TEMPROOT}${1}" | ${PAGER}
;;
[uU])
if [ -f "${B}" ]; then
echo "*** Restoring ${F}"
mv -f "${B}" "${F}"
fi
ALREADY_MERGED=false
;;
[vV])
${PAGER} "${TEMPROOT}${1}"
;;
"")
STAY_HERE=false
;;
*)
echo "*** Invalid selection!"
;;
esac
done
rm -f "._etcupdate_${TEMPROOT}${1}"
}
#
# main()
#
# Read global configuration
GLOBALRC="/etc/`basename $0`.conf"
[ -r ${GLOBALRC} ] && . ${GLOBALRC}
# Read user configuration
USERRC="${HOME}/.`basename $0`rc"
[ -r ${USERRC} ] && . ${USERRC}
# Read command line arguments
ARGV=`getopt ab:hlp:s:t:vw: $*`
[ $? != 0 ] && usage
set -- ${ARGV}
for i; do
case "${i}" in
-a)
AUTOMATIC=true
shift
;;
-b)
# Backward compatibility for deprecated "-b tempdir" option.
# Remove this after NetBSD-4.0 is released.
cat <<EOF
*** WARNING: The "-b tempdir" option is deprecated.
Please use "-s tempdir" in future.
EOF
BINARYMODE=true
BINARYDIRMODE=true
BINARYDIR="${arg}"
;;
-h)
usage
;;
-l)
LOCALSKIP=true
shift
;;
-p)
PAGER="${2}"
shift 2
;;
-s)
# Three cases:
# -s tgzfile
# -s srcdir
# -s extracted_dir
arg="${2}"
shift 2
if [ -f "${arg}" ]; then
# arg refers to a *.tgz file.
# This may happen twice, for both etc.tgz and
# xetc.tgz, so we build up a colon-separated
# list in TGZLIST.
BINARYMODE=true
BINARYTGZMODE=true
TGZLIST="${TGZLIST}${TGZLIST:+:}${arg}"
elif [ -d "${arg}" ] && [ -f "${arg}/etc/Makefile" ]; then
# arg refers to a source directory
SOURCEMODE=true
SRCDIR="${arg}"
elif [ -d "${arg}" ] && [ -f "${arg}/../etc/Makefile" ]; then
# backward compatibility: allow arg to refer to
# etc subdirectory within source dir.
# Remove this after NetBSD-4.0 is released.
cat <<EOF
*** WARNING: The "-s srcdir" option should refer to the top level
source directory, not to the etc subdirectory.
EOF
SOURCEMODE=true
SRCDIR="${arg}/.."
elif [ -d "${arg}" ] && [ -d "${ARG}/etc" ] \
&& ! [ -f "${arg}/etc/Makefile" ]
then
# arg refers to a directory where the
# sets have already been extracted
BINARYMODE=true
BINARYDIRMODE=true
BINARYDIR="${arg}"
else
usage
fi
;;
-t)
TEMPROOT="${2}"
shift 2
;;
-v)
VERBOSE=true
shift
;;
-w)
WIDTH="${2}"
shift 2
;;
--)
shift
break
;;
esac
done
# Last minute sanity checks
if [ `id -u` -ne 0 ]; then
echo "*** ERROR: You MUST be root"
exit 1
fi
if ${SOURCEMODE} && ${BINARYMODE}; then
usage
fi
if ${BINARYDIRMODE} && ${BINARYTGZMODE}; then
usage
fi
if ${BINARYDIRMODE}; then
SRCDIR="${BINARYDIR}"
TEMPROOT="${BINARYDIR}"
fi
if ${BINARYTGZMODE}; then
SRCDIR="${TEMPROOT}"
fi
if ! ${SOURCEMODE} && ! ${BINARYMODE}; then
# default if no "-s" option was specified
SOURCEMODE=true
SRCDIR=/usr/src
fi
if [ -z "${SRCDIR}" -o -z "${TEMPROOT}" ]; then
echo "*** ERROR: One of the following variables is undefined"
echo ""
echo "SRCDIR=\"${SRCDIR}\""
echo "TEMPROOT=\"${TEMPROOT}\""
echo ""
exit 1
fi
if ! ${BINARYDIRMODE} && [ -r "${TEMPROOT}" ]; then
echo ""
echo "*** WARNING: ${TEMPROOT} already exists"
echo ""
if yesno "Continue previously aborted update"; then
CONTINUE=true
elif yesno "Remove the old ${TEMPROOT}"; then
echo "*** Removing ${TEMPROOT}"
rm -rf "${TEMPROOT}"
fi
fi
if ! ${CONTINUE}; then
# Are we using the sources or binaries?
if ! ${BINARYDIRMODE}; then
# Create the temporary root directory
echo "*** Creating ${TEMPROOT}"
mkdir -p "${TEMPROOT}"
if [ ! -d "${TEMPROOT}" ]; then
echo "*** ERROR: Unable to create ${TEMPROOT}"
exit 1
fi
fi
if ${BINARYTGZMODE}; then
# Populate ${TEMPROOT} from ${TGZLIST}
oldIFS="${IFS}"
IFS=:
for tgz in ${TGZLIST}; do
if [ ! -f "${tgz}" ]; then
echo "*** ERROR: Unable to find ${tgz}"
exit 1
fi
echo "*** Populating ${TEMPROOT} from ${tgz}"
tar -zxpf "${tgz}" -C "${TEMPROOT}"
[ $? -ne 0 ] && exit 1
done
IFS="${oldIFS}"
elif ! ${BINARYMODE}; then
# Populate ${TEMPROOT} from ${SRCDIR}
if [ ! -f "${SRCDIR}/etc/Makefile" ]; then
echo "*** ERROR: Unable to find ${SRCDIR}/etc/Makefile"
exit 1
fi
# Set the environment for make.
#
# INSTALL_DONE=1 prevents installation of unwanted
# files (things that are not part of the etc set).
# BUILD=1 allows building of files that are wanted.
MAKE_ENV=" \
DESTDIR=${TEMPROOT} \
MAKE=make \
MTREE=mtree \
TOOL_MTREE=mtree \
INSTALL_DONE=1 \
BUILD=1 \
USETOOLS=never"
echo "*** Populating ${TEMPROOT} from ${SRCDIR}"
cd ${SRCDIR}/etc
if ! ${VERBOSE}; then
eval ${MAKE_ENV} make distribution > /dev/null
else
eval ${MAKE_ENV} make distribution
fi
[ $? -ne 0 ] && exit 1
fi
if [ ! -f "${TEMPROOT}/dev/MAKEDEV" ]; then
echo ""
echo "*** WARNING: ${TEMPROOT}/dev/MAKEDEV not found"
echo "Make sure you update /dev/MAKEDEV later and run"
echo "(cd /dev && ./MAKEDEV all) to rebuild the device nodes"
echo ""
fi
# Ignore the following files during comparision
rm -f "${TEMPROOT}"/etc/passwd
rm -f "${TEMPROOT}"/etc/pwd.db
rm -f "${TEMPROOT}"/etc/spwd.db
find "${TEMPROOT}" -type f -size 0 -exec rm {} \;
# Ignore files we're told to ignore
if [ ! -z "${IGNOREFILES}" ]; then
echo "*** Ignoring files: ${IGNOREFILES}"
for file in ${IGNOREFILES}; do
rm -f "${TEMPROOT}"${file}
done
fi
# Are there any new directories?
echo "*** Checking for new directories"
for i in `find ${TEMPROOT} -type d`; do
D=`echo ${i} | sed "s#${TEMPROOT}##"`
[ "x${i}" = "x${TEMPROOT}" ] && continue
[ ! -d "${D}" ] && install_dir "${D}"
done
fi
# Start the comparision
echo "*** Checking for added/modified files"
init_diff_extra_options
for i in `find ${TEMPROOT} -type f -a ! -name \*.etcupdate.\*`; do
D=`echo ${i} | sed "s#${TEMPROOT}##"`
diff_and_merge_file "${D}"
done
# Do we have files which were not processed?
REMAINING=`find "${TEMPROOT}" -type f -a ! -name \*.etcupdate.\*`
if [ ! -z "${REMAINING}" ]; then
echo ""
echo "*** The following files need your attention:"
echo ""
for i in ${REMAINING}; do
echo " ${i}"
done
echo ""
fi
if yesno "Remove ${TEMPROOT}"; then
echo "*** Removing ${TEMPROOT}"
rm -rf "${TEMPROOT}"
else
echo "*** Keeping ${TEMPROOT}"
fi
# Do some post-installation tasks
if ${NEED_MTREE}; then
if yesno "You have created new directories. Run mtree to set" \
"permissions"
then
(cd / && mtree -Udef /etc/mtree/NetBSD.dist)
fi
fi
if ${NEED_MAKEDEV}; then
if yesno "Do you want to rebuild the device nodes in /dev"; then
verbose "Running MAKEDEV in /dev"
(cd "/dev" && ./MAKEDEV all)
else
echo ""
echo "*** You SHOULD rebuild the device nodes in /dev"
echo "*** This is done by running \"(cd /dev &&" \
"./MAKEDEV all)\" as root".
echo ""
fi
fi
if ${NEED_NEWALIASES}; then
if yesno "Do you want to rebuild the mail alias database"; then
verbose "Running newaliases"
newaliases
else
echo ""
echo "*** You MUST rebuild the mail alias database to make" \
"the changes visible"
echo "*** This is done by running \"newaliases\" as root"
echo ""
fi
fi
if ${NEED_PWD_MKDB}; then
if yesno "Do you want to rebuild the password databases from the" \
"new master.passwd"
then
verbose "Running pwd_mkdb"
pwd_mkdb -p "/etc/master.passwd"
else
echo ""
echo "*** You MUST rebuild the password databases to make" \
"the changes visible"
echo "*** This is done by running \"pwd_mkdb -p" \
"/etc/master.passwd\" as root"
echo ""
fi
fi
if [ -x /usr/sbin/postinstall ] && ! ${BINARYMODE}; then
# XXX we should also run postinstall in binary mode
echo "*** Running /usr/sbin/postinstall"
/usr/sbin/postinstall -s "${SRCDIR}" check
fi
echo "*** All done"
|