diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-08-24 10:42:09 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-08-24 10:42:09 +0000 |
| commit | 4048c8c4e1ebc98383a10f648faff317703ea60d (patch) | |
| tree | 7204731bbd461ad6dfed60387dd6c0818c74a096 /distrib | |
| parent | 979096f1657eabe75d4fca4b726e2560d184c428 (diff) | |
/usr/share/sysmerge -> /var/sysmerge
requested by several
discussed with deraadt@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
| -rw-r--r-- | distrib/notes/m4.common | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/base/mi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 0332da7be24..c80bfd29d36 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.854 2015/08/06 14:55:51 deraadt Exp $ +# $OpenBSD: install.sub,v 1.855 2015/08/24 10:41:11 ajacoutot Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1260,7 +1260,7 @@ install_files() { *.tgz) ftp -D Installing -Vmo - "$_fsrc" | tar -zxphf - -C /mnt if [[ $_f == ?(x)base*.tgz && $MODE == install ]]; then ftp -D Extracting -Vmo - \ - file:///mnt/usr/share/sysmerge/${_f%%base*}etc.tgz | + file:///mnt/var/sysmerge/${_f%%base*}etc.tgz | tar -zxphf - -C /mnt fi ;; diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 0f06576df08..a7038a5873b 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.114 2015/08/17 20:07:12 guenther Exp $ +dnl $OpenBSD: m4.common,v 1.115 2015/08/24 10:41:11 ajacoutot Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org> dnl @@ -843,7 +843,7 @@ From then, the upgrade procedure is very close to the installation procedure described earlier in this document. However, it is strongly advised that you unpack the etc{:--:}.tgz and the -xetc{:--:}.tgz files found in /usr/share/sysmerge in a temporary +xetc{:--:}.tgz files found in /var/sysmerge in a temporary directory and merge changes by hand, or with the help of the sysmerge(8) helper script, since all components of your system may not function correctly until your files in `/etc' are updated.-:})dnl diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 47a2481209f..5606ea78329 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -2644,8 +2644,6 @@ ./usr/share/snmp/mibs/OPENBSD-PF-MIB.txt ./usr/share/snmp/mibs/OPENBSD-SENSORS-MIB.txt ./usr/share/snmp/mibs/OPENBSD-SNMPD-CONF.txt -./usr/share/sysmerge -./usr/share/sysmerge/etc.tgz ./usr/share/tabset ./usr/share/tabset/std ./usr/share/tabset/stdcrt @@ -4549,6 +4547,8 @@ ./var/spool/smtpd/temporary ./var/spool/uucp ./var/spool/uucppublic +./var/sysmerge +./var/sysmerge/etc.tgz ./var/tmp ./var/unbound ./var/unbound/db diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 42691513cea..04da2ec5ea9 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -52,8 +52,6 @@ ./root/.cvsrc ./root/.login ./root/.profile -./usr/share/sysmerge/etcsum -./usr/share/sysmerge/examplessum ./var/crash/minfree ./var/cron/at.deny ./var/cron/cron.deny @@ -73,6 +71,8 @@ ./var/log/xferlog ./var/mail/root ./var/nsd/etc/nsd.conf +./var/sysmerge/etcsum +./var/sysmerge/examplessum ./var/unbound/etc/unbound.conf ./var/www/conf/bgplg.css ./var/www/conf/bgplg.foot |