qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove osrelease from system.fvwmrc

Browse Source 
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
This commit is contained in:
kn 2020-09-30 20:42:12 +00:00
parent 3b94b75328
commit d133aea95f
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/fvwm/sample.fvwmrc/Makefile
View File

@ -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 \

2
app/fvwm/sample.fvwmrc/system.fvwmrc
View File

@ -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