diff options
| author | eivind <eivind@FreeBSD.org> | 2004-01-21 23:10:35 +0800 |
|---|---|---|
| committer | eivind <eivind@FreeBSD.org> | 2004-01-21 23:10:35 +0800 |
| commit | 521e6c23b0f7173dc175fdccff20078aa1c8ca7d (patch) | |
| tree | 7b7440f50e3fad7763640e32dbd932985886faeb /sysutils/etcmerge | |
| parent | 0ccb3b8f8340feb8e382a1bf05c4097498f2fdfa (diff) | |
| download | freebsd-ports-gnome-521e6c23b0f7173dc175fdccff20078aa1c8ca7d.tar.gz freebsd-ports-gnome-521e6c23b0f7173dc175fdccff20078aa1c8ca7d.tar.zst freebsd-ports-gnome-521e6c23b0f7173dc175fdccff20078aa1c8ca7d.zip | |
Update to version 0.4:
* Update docs with a better mergemaster procedure and better markup.
Partially submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
* Make etcmerge show usage information when run with no arguments.
Noticed by: Daniel O'Connor <doconnor@gsoft.com.au>
Diffstat (limited to 'sysutils/etcmerge')
| -rw-r--r-- | sysutils/etcmerge/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/etcmerge/src/etcmerge.8 | 20 | ||||
| -rw-r--r-- | sysutils/etcmerge/src/etcmerge.sh | 7 |
3 files changed, 24 insertions, 7 deletions
diff --git a/sysutils/etcmerge/Makefile b/sysutils/etcmerge/Makefile index 4495c928d960..21649b64f808 100644 --- a/sysutils/etcmerge/Makefile +++ b/sysutils/etcmerge/Makefile @@ -8,8 +8,8 @@ # PORTNAME= etcmerge -PORTVERSION= 0.3 -PORTREVISION= 2 +PORTVERSION= 0.4 +PORTREVISION= 0 CATEGORIES= sysutils textproc MASTER_SITES= # none DISTFILES= # none diff --git a/sysutils/etcmerge/src/etcmerge.8 b/sysutils/etcmerge/src/etcmerge.8 index 8db8e50891db..110d54e70a71 100644 --- a/sysutils/etcmerge/src/etcmerge.8 +++ b/sysutils/etcmerge/src/etcmerge.8 @@ -95,17 +95,29 @@ First, ensure you have a copy of the /etc distributed by FreeBSD (BEFORE you or .Xr sysinstall 8 started modifying it) stored in .Pa /var/db/etc . -There are two easy ways to do this: Either download a copy matching your +There are two easy ways to do this: +.Bl -enum -compact +.It +Download a copy matching your installation from .Pa http://people.freebsd.org/~eivind/etc/ and extract this in -.Pa /var/db/ -or run +.Pa /var/db/ . +.It +Run .Xr mergemaster 8 -one last time, and copy +one last time to get your /etc up to date. +Then rerun +.Xr mergemaster 8 +with the +.Fl v +option, exit after it creates +.Pa /var/tmp/temproot , +and copy .Pa /var/tmp/temproot/etc to .Pa /var/db/etc . +.El .Pp When you have .Pa /var/db/etc diff --git a/sysutils/etcmerge/src/etcmerge.sh b/sysutils/etcmerge/src/etcmerge.sh index 6965a4af8ee8..da3b8c66012e 100644 --- a/sysutils/etcmerge/src/etcmerge.sh +++ b/sysutils/etcmerge/src/etcmerge.sh @@ -57,7 +57,6 @@ shift $(($OPTIND - 1)) # Where we store class files # CLASSDIR=${WORKDIR}/classes -mkdir -p ${CLASSDIR} # # Where the new "root" is linked from @@ -110,6 +109,10 @@ conflictshow() { fi } +if [ "$#" -lt 1 ]; then + usage + exit 1 +fi case "$1" in init) ;; install) @@ -176,6 +179,8 @@ esac echo "ETCMERGE: >>> Creating new etc data from ${USRSRC}" +# Also creates our base work directory +mkdir -p ${CLASSDIR} # # XXX Make sure we have all needed users and groups before this # |