| Age | Commit message (Collapse) | Author |
|---|
|
|
|
ok aja@
|
|
makemap when we are in fact running newaliases...).
No functionnal change.
|
|
(doubtful) but since files tend to move from one set to another sysmerge
would end up tagging them as obsolete. I see no way to fix this...
req. by and ok deraadt@, ok landry sthen@
|
|
added to the front of the file, then sent through system() of equiv.
ok aja
|
|
|
|
ok sthen@
|
|
|
|
|
|
http://) so that sysmerge(8) can work with URLs we use in the install
script.
ok sthen@
|
|
Update copyright year while here.
|
|
need to install files or directories with newly added user/group
ownerships.
ok sthen@ (on a slightly different diff)
|
|
to create, otherwise sysmerge will fail installing it. This can happen
for example when you only installed etcXX but run sysmerge against both
etcXX and xetcXX.
found the hard way by and ok sthen@
|
|
* "Installing foo" -> "{Merging,Upgrading} foo" where it makes sense
* remove the "it will remain to merge by hand" msg, too chatty and we
already tell the user at the end of a sysmerge run if some files are
still left to handle
ok sthen@
|
|
|
|
help from and ok naddy@
|
|
clear if there are any warning/error or things that should be handled
manually.
e.g. output from going from 4.8 to current:
# sysmerge -s etc49.tgz -x xetc49.tgz
===> Populating temporary root under /var/tmp/sysmerge.k1BnD/temproot
===> Starting comparison
===> Installing /.profile
===> Installing /etc/bgpd.conf
<...>
===> Installing /root/.profile
===> Installing /var/www/conf/mime.types
===> Comparison complete
===> Checking directory hierarchy permissions (running mtree(8))
===> Output log available at /var/tmp/sysmerge.k1BnD/sysmerge.log
*** WARNING: file(s) detected as obsolete: /etc/portal.conf /etc/security /var/msgs/bounds
*** WARNING: some new/updated file(s) may require a reboot
feedback and ok sthen@
|
|
occurence.
with a small tweak from an ok sthen@
|
|
prodded by and ok espie@, ok jmc@
|
|
updated files in the output, this is confusing.
ok sthen@
|
|
correct option (e.g. 'sysmerge /tmp/etc48.tgz'). Use OPTIND as all args
are handled by getopts we can catch misusage and we exit with an error.
from Brian Poole, thanks.
ok sthen@
|
|
src/*.tgz isn't specified. ok ajacoutot@
|
|
tarball contains ./var/db/sysmerge/etcsum or ./var/db/sysmerge/xetcsum.
First, it's more correct and second it allows people to rename the sets
without sysmerge bailing out.
feature requested and tested by oga@
|
|
starting the comparison anymore. It does not bring us anything and
allows to chop 30 lines of the script.
While here, remove some empty lines.
|
|
|
|
(does *NOT* touch existing users/groups)
"I like it" from several...
inputs from sthen@ and halex@
ok krw@ halex@ sthen@
|
|
reported by matthieu@
req. by and "I like it" deraadt@
|
|
is called.
While here, change shebang to /bin/ksh to reflect reality and bump
copyright year.
"checkbashisms says yes. :-)" && ok sthen@
|
|
review, specifically it's now not printed for every auto-installed
file, giving a much more compact output. ok ajacoutot@
- skip the blank line before 'Comparison complete' suggested by ajacoutot.
|
|
ok sthen@
|
|
ok sthen@
|
|
ok sthen@
|
|
ok sthen@
|
|
Fix TMPDIR while here and remove the EDITOR definition, it is only used
once.
ok sthen@
|
|
Remove the '-a' switch (auto-mode) and make this behaviour the default.
Add a new '-d' switch to get former default (full diff) mode.
General idea ok for several.
man page improvements from jmc@
ok jim@ oga@ sobrado@
ok sthen@ "sane defaults++ :)"
|
|
|
|
ok sthen@
|
|
spotted by jmc@
|
|
|
|
missed some very much needed symlinks under /etc/fonts/conf.d/).
The behaviour is the following, if a link does not exist:
* in '-a' mode, it is created automatically
* in normal mode, sysmerge will ask what you want to do
If one wants to use '-a' mode while still being in control of what
links are created, sysmerge.ignore can be used.
"sounds good to" phessler@, ok sthen@
|
|
ok sthen@
|
|
``please put it in'', pyr@
|
|
Remove top comments already duplicated in the man page.
"sure" sthen@
|
|
- remove -SX from usage()
ok ajacoutot
|
|
From now on, checksums of reference files (sets and/or src) will be
stored under /var/db/sysmerge/{etcsum,xetcsum,srcsum} . This allows for
"remembering last choice" several people have requested.
This deprecates the need for -X and -S which have been removed (these
switches may come back at some point for the auto-patch feature which
halex@ proposed).
It will only compare files which reference sources have changed since
the last run and will attempt to automatically upgrade them to the
newest version provided that they have no local changes.
i.e. first run should dislay differences, second run should not display
anything except if something changed between old and new sets/src. This
way sysmerge can also warn you from files which may have been obsoleted.
General idea taken from Net/FreeBSD but we're doing things differently.
Intensively discussed with oga@, sthen@ and halex@
ok oga@ sthen@
|
|
Move unset NO_INSTALLED where it belongs, at the start of the function.
Several minor cleanups.
from Alexander Hall
ok sthen@
|
|
mostly from and ok sthen@
|
|
it impossible to install a virgin one over the currently installed one.
from Mitja Muzenic, with a tweak
|
|
that only differ by CVS Id (adapted from FreeBSD mergemaster)
Ground work on the man page, from jmc@
* do not duplicate info
* rewordings
* move some stuffs around
ok jmc@ sthen@
|
|
Tweak some outputs and put interesting messages into sysmerge.log.
export the NEED_NEWALIASES variable.
inputs from and ok sthen@
|
