Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-03-06 | Just exit 1 instead of printing usage on error. | Antoine Jacoutot | |
prodded by deraadt@ | |||
2017-01-11 | Instead of checking if /etc/X11 is around to know whether the xbase set | Antoine Jacoutot | |
is installed, check if /var/sysmerge/xetc.tgz exists. | |||
2016-09-22 | Make sure we don't have conflicting UIDs/GIDs when adding user/group. | Antoine Jacoutot | |
reported by florian@ | |||
2016-09-06 | Mention PAGER behavior when undefined/empty. | Antoine Jacoutot | |
from Michael Reed ok jmc@ | |||
2016-09-02 | move links from http to https://www.openbsd.org/ | Theo Buehler | |
ok beck | |||
2016-07-30 | Remove compat code. | Antoine Jacoutot | |
2016-05-14 | Be gone /var/sysmerge/examplessum. | Antoine Jacoutot | |
2016-05-14 | Remove handling of /etc/examples/ files by sysmerge(8). Getting regular messages | Antoine Jacoutot | |
about pkg.conf isn't really that helpful and if a big syntax change comes along well we have current.html. it was disabled during p2k16 and no one complained so far discussed with and ok deraadt@ | |||
2016-04-29 | In sysmerge interactive mode, check syntax of several important files after | Stuart Henderson | |
merging (currently sshd_config, login.conf, pf.conf) to give some protection against bad merges. feedback/ok ajacoutot@ | |||
2016-04-28 | Comment sm_check_an_eg(). | Antoine Jacoutot | |
2016-04-27 | sysmerge(8) is the bastard child of ksh and perl, so just call it a "utility". | Antoine Jacoutot | |
2016-04-26 | Tweak output a bit; to be improved probably (sthen@ and I can't think of a | Antoine Jacoutot | |
better wording for now). Also be consistent in batch and interactive mode: make sure we can just re-run sysmerge if we leave a file for later; this prevents having to save the tmpdir to find which files needs to be handled (aka we are self-contained). | |||
2016-02-02 | Uppecase. | Antoine Jacoutot | |
2016-01-14 | No more /etc/mail/aliases.db. | Antoine Jacoutot | |
2015-12-23 | Tidy up output. | Antoine Jacoutot | |
2015-12-21 | Only run newaliases(8) if we already have an aliases db. | Antoine Jacoutot | |
2015-11-28 | chflags -l flag went away. Noticed this myself 15 minutes | Theo de Raadt | |
before Chris Hettrick did. | |||
2015-10-18 | Make sure sm_rotate_bak() is only run once. | Antoine Jacoutot | |
2015-10-16 | Drop usage of TMPDIR. | Antoine Jacoutot | |
While here, stop refering to /tmp/sysmerge.XXXXXXXXXX, that's a script internal we don't need to know about. | |||
2015-10-13 | sm_error() already does the exit for us. | Antoine Jacoutot | |
2015-10-12 | Reverse the sm_error call in sm_trap. | Antoine Jacoutot | |
pointed out by semarie@... I need some sleep :/ | |||
2015-10-12 | Only remove existing sum files on trap handlers. | Antoine Jacoutot | |
req. by semarie@ | |||
2015-09-18 | In case of a hard error, remove all checksums except for examplessum which | Antoine Jacoutot | |
is special. Otherwise, we may miss comparing files at next run; we may miss some automation on the next run but it's safer this way. | |||
2015-09-18 | Simplify: we don't need a work directory anymore, temproot is enough. | Antoine Jacoutot | |
2015-09-18 | Tweak warning/error output a bit. | Antoine Jacoutot | |
Check for examples changes at the end. | |||
2015-09-18 | More dead code. | Antoine Jacoutot | |
2015-09-09 | Remove more dead code. | Antoine Jacoutot | |
2015-09-09 | Remove unused code. | Antoine Jacoutot | |
2015-09-09 | Move and tweak a comment. | Antoine Jacoutot | |
2015-09-07 | Simplify handling of sum files. | Antoine Jacoutot | |
2015-09-07 | No need to restore backup of sum files; once the new ones are installed, | Antoine Jacoutot | |
it means we already processed all relevant files. | |||
2015-08-24 | cp -> mv | Antoine Jacoutot | |
Put /usr/share/sysmerge under XXX. | |||
2015-08-24 | Make backup directory of replaced files persistent: /var/sysmerge/backups. | Antoine Jacoutot | |
3 rotations so that we have history of modified files. In batch mode, when a file cannot be handled automatically, remove it from the checksum file so that the next interactive sysmerge(8) run will ask to merge the changes. ok rpe@ | |||
2015-08-24 | /usr/share/sysmerge -> /var/sysmerge | Antoine Jacoutot | |
requested by several discussed with deraadt@ | |||
2015-08-19 | Remove XXX. | Antoine Jacoutot | |
2015-08-13 | Sync stripcom() with /etc/rc. | Antoine Jacoutot | |
2015-07-27 | use file system path (.Pa) semantic markup macros where appropriate. | Igor Sobrado | |
ok jmc@ | |||
2015-07-18 | Add groups before users. | Antoine Jacoutot | |
2015-06-02 | fix variable name typo | Joerg Jung | |
ok ajacoutot@ | |||
2015-03-12 | Set TERM if unset. Fixes some remote sysmerge usage by sthen@ | Antoine Jacoutot | |
ok sthen@ | |||
2015-02-17 | Instead of a relatively complex "stty size | ( read ..." in sysmerge, use | Stuart Henderson | |
"tput cols". (This from ajacoutot@). Use it directly in the sdiff command, rather than saving it once at startup. Handling window size changes at runtime makes sysmerge significantly easier to use in common cases. Adds around .17s per sdiff invocation on my slowest machine (486), imperceptible on a faster machine, so it seems a reasonable trade-off. ok ajacoutot@ | |||
2014-11-26 | Drop sysmerge.log ; it used to be handy for batch mode but now the | Antoine Jacoutot | |
console output is clear and clean in that mode. Since /var/tmp is now a symlink to /tmp: - directly use /tmp - if modifications were done; at the end of the run: - display our backup directory (in case we want to move it to survive a reboot) - display where and what files are still left for comparison discussed with and ok sthen@ | |||
2014-10-09 | Tweak, no functional change. | Antoine Jacoutot | |
2014-10-09 | Make sure _instdir is not null. | Antoine Jacoutot | |
issue reported by jsg@ | |||
2014-09-16 | zap unnecessary quotes | Robert Peichaer | |
OK ajacoutot@ | |||
2014-09-13 | In PKG mode, cope with non-default PREFIX (e.g. /var/www/...). | Antoine Jacoutot | |
2014-09-09 | 'rm -f' in case we skip a release. No functional change, just cosmetic. | Antoine Jacoutot | |
2014-09-09 | Rreplace [[ -n $(grep..) ]] and [[ -z $(grep..) ]] | Robert Peichaer | |
with grep -q and ! grep -q. OK ajacoutot@ | |||
2014-09-09 | Replace last usage of awk in sysmerge with a shell equivalent. | Robert Peichaer | |
based on a diff from and OK ajacoutot@ | |||
2014-09-08 | Put chpass(1) args between quotes. | Antoine Jacoutot | |
spotted by matthieu@ |