Module Name: src
Committed By: martin
Date: Thu Apr 11 14:45:58 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Do not test contents of non-existing Xresource file (if X11 sets have
not been installed)
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.224 src/usr.sbin/postinstall/postinstall:1.225
--- src/usr.sbin/postinstall/postinstall:1.224 Sat Mar 9 23:46:34 2019
+++ src/usr.sbin/postinstall/postinstall Thu Apr 11 14:45:58 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.224 2019/03/09 23:46:34 mrg Exp $
+# $NetBSD: postinstall,v 1.225 2019/04/11 14:45:58 martin Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1857,7 +1857,8 @@ do_x11()
done
# check if xdm resources have been updated
- if ! ${GREP} 'inpColor:' ${_etcx11}/xdm/Xresources > /dev/null; then
+ if [ -r ${_etcx11}/xdm/Xresources ] && \
+ ! ${GREP} 'inpColor:' ${_etcx11}/xdm/Xresources > /dev/null; then
msg "Update ${_etcx11}/xdm/Xresources${_notfixed}"
failed=1
fi
