diff options
| author | kn <kn@cvs.openbsd.org> | 2020-09-30 20:42:13 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2020-09-30 20:42:13 +0000 |
| commit | 4b233a743b6f5107123afba785fac87621df3325 (patch) | |
| tree | 6303572fe0ec3ab4c2675bd238e731839f3adf5b /app/fvwm | |
| parent | abed5172d704aa7d8defc6f76386547c257406ec (diff) | |
Remove osrelease from system.fvwmrc
This is the version string that shows up as part of "OpenBSD 6.8" in the
bottom right window in a default installation.
But as this version stems from the build machine's kernel with which fvwm
was build, it can differ from the version you're running on your machine
which is what you'd expect as user.
Such values must not be derived from the build environment; instead of
fixing it up, remove the version number entirely and leave it to the user's
~/.fvwmrc to update the label if need be.
OK deraadt
Diffstat (limited to 'app/fvwm')
| -rw-r--r-- | app/fvwm/sample.fvwmrc/Makefile | 6 | ||||
| -rw-r--r-- | app/fvwm/sample.fvwmrc/system.fvwmrc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/fvwm/sample.fvwmrc/Makefile b/app/fvwm/sample.fvwmrc/Makefile index 13bd6a4d3..def4be8ad 100644 --- a/app/fvwm/sample.fvwmrc/Makefile +++ b/app/fvwm/sample.fvwmrc/Makefile @@ -1,15 +1,13 @@ -# $OpenBSD: Makefile,v 1.7 2008/01/06 18:13:58 matthieu Exp $ +# $OpenBSD: Makefile,v 1.8 2020/09/30 20:42:12 kn Exp $ .include "../Makefile.inc" -OSRELEASE=`/sbin/sysctl -n kern.osrelease 2>&1` RM?=rm depend: all: - @sed -e "s,__osrelease__,${OSRELEASE}," \ - ${.CURDIR}/system.fvwmrc > .fvwmrc + @cat ${.CURDIR}/system.fvwmrc > .fvwmrc install: ${INSTALL_DATA} .fvwmrc \ diff --git a/app/fvwm/sample.fvwmrc/system.fvwmrc b/app/fvwm/sample.fvwmrc/system.fvwmrc index 3470d37b6..d772a7bee 100644 --- a/app/fvwm/sample.fvwmrc/system.fvwmrc +++ b/app/fvwm/sample.fvwmrc/system.fvwmrc @@ -352,7 +352,7 @@ Key F8 A M CirculateDown *FvwmPagerFore white *FvwmPagerHilight #2d2d2d *FvwmPagerGeometry 80x60-1-1 -*FvwmPagerLabel 0 "OpenBSD __osrelease__" +*FvwmPagerLabel 0 "OpenBSD" *FvwmPagerLabel 1 Maker *FvwmPagerLabel 2 Mail *FvwmPagerLabel 3 Matlab |