Searched hist:227145 (Results 1 - 2 of 2) sorted by relevance

/freebsd-9.3-release/usr.sbin/mergemaster/
H A Dmergemaster.8diff 227145 Sun Nov 06 06:00:17 MST 2011 dougb MFC r227013:

1. Add a new option, --run-updates, to always or never run the newalises,
pwd_mkdb, etc. updates at the end of the comparison.

2. Add an update to the end to handle /etc/localtime, if it exists.
If /var/db/zoneinfo exists, automatically update /etc/localtime,
which should (hopefully) be safe to do. If not, prompt the user
to run tzsetup.

3. Update run_it_now(), the function that handles input for the updates,
to make sure that we got a valid answer, and to handle the --run-updates
option if supplied.

Approved by: re (kensmith)
H A Dmergemaster.shdiff 227145 Sun Nov 06 06:00:17 MST 2011 dougb MFC r227013:

1. Add a new option, --run-updates, to always or never run the newalises,
pwd_mkdb, etc. updates at the end of the comparison.

2. Add an update to the end to handle /etc/localtime, if it exists.
If /var/db/zoneinfo exists, automatically update /etc/localtime,
which should (hopefully) be safe to do. If not, prompt the user
to run tzsetup.

3. Update run_it_now(), the function that handles input for the updates,
to make sure that we got a valid answer, and to handle the --run-updates
option if supplied.

Approved by: re (kensmith)

Completed in 84 milliseconds