diff options
| author |   rpe <rpe@openbsd.org> | 2014-09-11 07:08:37 +0000 |
|---|---|---|
| committer | rpe <rpe@openbsd.org> | 2014-09-11 07:08:37 +0000 |
| commit | f95050cd45e728ab6a5302b2d5adabfb513d0e37 (patch) | |
| tree | 58c57e682fd8e0e9912dbf6bb088df85de258ae3 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-f95050cd45e728ab6a5302b2d5adabfb513d0e37.tar.xz wireguard-openbsd-f95050cd45e728ab6a5302b2d5adabfb513d0e37.zip | |
Tweak notes after moving xetc to xbase.
OK matthieu@ ajacoutot@
| -rw-r--r-- | distrib/notes/m4.common | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index ae57da24bfc..b327d74b489 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.111 2014/08/26 20:19:26 rpe Exp $ +dnl $OpenBSD: m4.common,v 1.112 2014/09/11 07:08:37 rpe Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org> dnl @@ -148,14 +148,6 @@ define({:-OpenBSDxbase-:}, programs, headers and libraries.showsize($1,$2)-:})dnl dnl dnl -dnl OpenBSDxetc( compressed size, uncompressed size ) -dnl Describes xetcXX.tgz. -dnl -define({:-OpenBSDxetc-:}, -{:- xetc{:--:}OSrev This set includes the X window system configuration files - that reside in /etc. It's the equivalent of etc{:--:}OSrev for X.showsize($1,$2)-:})dnl -dnl -dnl dnl OpenBSDxshare( compressed size, uncompressed size ) dnl Describes xshareXX.tgz. dnl @@ -849,13 +841,10 @@ will use the existing filesystems defined in /etc/fstab to install the new system in. It will also use your existing network parameters. From then, the upgrade procedure is very close to the installation -procedure described earlier in this document. Note that the upgrade -procedure will not let you pick the ``xetc{:--:}OSrev.tgz'' set, so as to -preserve your files in `/etc' which you are likely to have customized -since a previous installation. +procedure described earlier in this document. -However, it is strongly advised that you unpack the etc{:--:}.tgz file -found in /usr/share/sysmerge and the xetc{:--:}OSrev.tgz in a temporary +However, it is strongly advised that you unpack the etc{:--:}.tgz and the +xetc{:--:}.tgz files found in /usr/share/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 |