Module Name: src
Committed By: snj
Date: Wed Apr 1 22:21:51 UTC 2009
Modified Files:
src/usr.sbin/postinstall [netbsd-5]: postinstall
Log Message:
Apply patch (requested by martin in ticket #642):
Make ddb.onpanic and kern.no_sa_support acceptable even if commented out.
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.11 -r1.76.2.12 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.76.2.11 src/usr.sbin/postinstall/postinstall:1.76.2.12
--- src/usr.sbin/postinstall/postinstall:1.76.2.11 Sat Mar 28 18:57:10 2009
+++ src/usr.sbin/postinstall/postinstall Wed Apr 1 22:21:50 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.76.2.11 2009/03/28 18:57:10 snj Exp $
+# $NetBSD: postinstall,v 1.76.2.12 2009/04/01 22:21:50 snj Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -667,7 +667,7 @@
{
[ -n "$1" ] || err 3 "USAGE: do_ddbonpanic fix|check"
- if ${GREP} -E '^[[:space:]]*ddb\.onpanic[[:space:]]*=[[:space:]]*[[:digit:]]+' \
+ if ${GREP} -E '^#*[[:space:]]*ddb\.onpanic[[:space:]]*=[[:space:]]*[[:digit:]]+' \
"${DEST_DIR}/etc/sysctl.conf" >/dev/null 2>&1
then
result=0
@@ -884,7 +884,7 @@
{
[ -n "$1" ] || err 3 "USAGE: do_nosa fix|check"
- if ${GREP} -E '^[[:space:]]*kern\.no_sa_support[[:space:]]*=[[:space:]]*[[:digit:]]+' \
+ if ${GREP} -E '^#*[[:space:]]*kern\.no_sa_support[[:space:]]*=[[:space:]]*[[:digit:]]+' \
"${DEST_DIR}/etc/sysctl.conf" >/dev/null 2>&1
then
result=0
