| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-02-17 | Remove the backup chunk from the man page. People should use backup | Antoine Jacoutot | |
| anyway and sysmerge(8) automatically save replaced files. ok sthen@ | |||
| 2011-10-09 | add a missing newline when you merge login.conf if login.conf.db doesn't exist | Stuart Henderson | |
| ok aja@ | |||
| 2011-09-01 | Fix the display of running utilities (e.g. don't say we are running | Antoine Jacoutot | |
| makemap when we are in fact running newaliases...). No functionnal change. | |||
| 2011-08-03 | Remove the 'obsolete file(s)' feature. It may come back at some point | Antoine Jacoutot | |
| (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@ | |||
| 2011-07-21 | Adjust work directory name. | Antoine Jacoutot | |
| 2011-07-11 | EDITOR or VISUAL are not a path. They are a string that needs to be | Theo de Raadt | |
| added to the front of the file, then sent through system() of equiv. ok aja | |||
| 2011-07-11 | use more XXX for mktemp; ok ajacoutot | Theo de Raadt | |
| 2011-07-06 | Harden the checks on the provided sets/src to make sure they are legit. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2011-07-06 | Consistency in stdout redirections. | Antoine Jacoutot | |
| 2011-07-06 | Indent, no change. | Antoine Jacoutot | |
| 2011-07-05 | Make it possible to pass https:// and file:// (along with ftp:// and | Antoine Jacoutot | |
| http://) so that sysmerge(8) can work with URLs we use in the install script. ok sthen@ | |||
| 2011-05-09 | Installing -> Updating. | Antoine Jacoutot | |
| Update copyright year while here. | |||
| 2011-05-08 | Make sure /etc/group and /etc/master.passwd are handled first in case we | Antoine Jacoutot | |
| need to install files or directories with newly added user/group ownerships. ok sthen@ (on a slightly different diff) | |||
| 2011-05-06 | If it doesn't exist, create the directory holding the link we are about | Antoine Jacoutot | |
| 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@ | |||
| 2011-04-27 | Cosmetic: | Antoine Jacoutot | |
| * "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@ | |||
| 2011-04-21 | Oopsy. | Antoine Jacoutot | |
| 2011-04-21 | Better detection of obsolete files (naddy@ reported a false positive). | Antoine Jacoutot | |
| help from and ok naddy@ | |||
| 2011-04-20 | Enhance sysmerge(8) output so that it is more readable and make it more | Antoine Jacoutot | |
| 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@ | |||
| 2011-04-18 | Fix a bug where OBSOLETE_FILES would contain only the last appended | Antoine Jacoutot | |
| occurence. with a small tweak from an ok sthen@ | |||
| 2010-11-11 | Missed that part in previous. | Antoine Jacoutot | |
| from jmc@ | |||
| 2010-11-11 | Unconfuse usage. | Antoine Jacoutot | |
| prodded by and ok espie@, ok jmc@ | |||
| 2010-11-08 | No need to differentiate newly installed files versus automatically | Antoine Jacoutot | |
| updated files in the output, this is confusing. ok sthen@ | |||
| 2010-11-04 | Make sure we don't end up using /usr/src/etc if we forget to pass the | Antoine Jacoutot | |
| 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@ | |||
| 2010-08-21 | Display usage information as well as the error when a path to | Stuart Henderson | |
| src/*.tgz isn't specified. ok ajacoutot@ | |||
| 2010-07-20 | Instead of checking for the *etcXX.tgz filename, check whether the | Antoine Jacoutot | |
| 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@ | |||
| 2010-07-17 | When running in full diff mode, don't wait for user input before | Antoine Jacoutot | |
| 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. | |||
| 2010-07-06 | Add a blank line between sections in the output log, it's more readable. | Antoine Jacoutot | |
| 2010-07-05 | Automatically install missing users and groups. | Antoine Jacoutot | |
| (does *NOT* touch existing users/groups) "I like it" from several... inputs from sthen@ and halex@ ok krw@ halex@ sthen@ | |||
| 2010-06-27 | Suggest a reboot if "sh MAKEDEV" was run or login.conf was modified. | Antoine Jacoutot | |
| reported by matthieu@ req. by and "I like it" deraadt@ | |||
| 2010-03-20 | s/sh/ksh/ | Antoine Jacoutot | |
| 2010-02-06 | Remove newly generated sum file(s) if it did not exist before and trap | Antoine Jacoutot | |
| is called. While here, change shebang to /bin/ksh to reflect reality and bump copyright year. "checkbashisms says yes. :-)" && ok sthen@ | |||
| 2010-01-13 | - move the separator so it's just displayed for files with diffs to | Stuart Henderson | |
| 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. | |||
| 2009-12-18 | xargs takes the whole list as argument, so no need to append. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-12-18 | Add etcsum and xetcsum to IGNORE_FILES. Needed for upcoming change. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-12-06 | Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-10-02 | Use BSD.x11.dist mtree file now that it is up-to-date and maintained. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-08-24 | Harden variables setting, prodded by alex@ | Antoine Jacoutot | |
| Fix TMPDIR while here and remove the EDITOR definition, it is only used once. ok sthen@ | |||
| 2009-08-23 | Document all variables used by sysmerge. | Antoine Jacoutot | |
| "fine" jmc@ | |||
| 2009-08-18 | HEADS-UP: change the way sysmerge(8) runs by default. | Antoine Jacoutot | |
| 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++ :)" | |||
| 2009-08-17 | Don't try to move files that don't exist. | Antoine Jacoutot | |
| 2009-08-16 | Properly initialize the array setting auto-upgradable files. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-06-28 | Fix small regression introduced with symlinks handling. | Antoine Jacoutot | |
| spotted by jmc@ | |||
| 2009-06-28 | Remove useless blank space in output. | Antoine Jacoutot | |
| 2009-06-28 | Teach sysmerge to deal with links (found the hard way when I realised I | Antoine Jacoutot | |
| 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@ | |||
| 2009-06-14 | DBDIR resides in DESTDIR. | Antoine Jacoutot | |
| ok sthen@ | |||
| 2009-06-05 | tweak previous; | Jason McIntyre | |
| 2009-06-04 | When in auto-mode, automatically install binary files (from the X set). | Antoine Jacoutot | |
| ``please put it in'', pyr@ | |||
| 2009-05-13 | Remove unused args from getopts. | Antoine Jacoutot | |
| Remove top comments already duplicated in the man page. "sure" sthen@ | |||
| 2009-05-12 | simplify the descriptions of -a and -b; this has taken me and antoine | Jason McIntyre | |
| an entire day of mailing to make this tweak ;( ok ajacoutot | |||
| 2009-05-12 | - tweak the description of -a | Jason McIntyre | |
| - remove -SX from usage() ok ajacoutot | |||
 |
index : src | |
| OpenBSD base system |
| summaryrefslogtreecommitdiff |