From nobody@FreeBSD.org  Sun Oct 16 15:26:22 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B8D2106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 16 Oct 2011 15:26:22 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B6A88FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 16 Oct 2011 15:26:22 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9GFQLFH002277
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 16 Oct 2011 15:26:21 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p9GFQLPj002276;
	Sun, 16 Oct 2011 15:26:21 GMT
	(envelope-from nobody)
Message-Id: <201110161526.p9GFQLPj002276@red.freebsd.org>
Date: Sun, 16 Oct 2011 15:26:21 GMT
From: Manolis Kiagias <manolis@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] bsdinstall(8) does not quote the keymap setting in rc.conf
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         161711
>Category:       bin
>Synopsis:       [patch] bsdinstall(8) does not quote the keymap setting in rc.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-sysinstall
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 16 15:30:25 UTC 2011
>Closed-Date:    Sun Oct 23 15:25:44 UTC 2011
>Last-Modified:  Sun Nov  6 16:40:07 UTC 2011
>Originator:     Manolis Kiagias
>Release:        9.0-BETA3
>Organization:
>Environment:
>Description:
When selecting a keyboard map during installation with bsdinstall, the relevant rc.conf entry is written without quotes. While quotes are not necessary, all entries have had them till now (sysinstall always quoted settings) and it also seems every other bsdinstall entry is quoted.
Apparently the problem lies with the kbdmap program called from bsdinstall. 
>How-To-Repeat:
Select a keyboard map during installation. Look at the rc.conf entry after installation.
>Fix:
Apply the following patch to kbdmap.c

Patch attached with submission follows:

--- kbdmap.c.original	2011-10-16 18:12:55.000000000 +0300
+++ kbdmap.c	2011-10-16 18:14:12.000000000 +0300
@@ -289,7 +289,7 @@
 	if (!x11)
 		system(kbd_cmd);
 
-	fprintf(stderr, "keymap=%s\n", km->keym);
+	fprintf(stderr, "keymap=\"%s\"\n", km->keym);
 	free(kbd_cmd);
 }
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->sysinstall 
Responsible-Changed-By: manolis 
Responsible-Changed-When: Sun Oct 16 15:35:25 UTC 2011 
Responsible-Changed-Why:  
Reassign 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161711 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/161711: commit references a PR
Date: Sun, 16 Oct 2011 16:05:37 +0000 (UTC)

 Author: nwhitehorn
 Date: Sun Oct 16 16:05:23 2011
 New Revision: 226439
 URL: http://svn.freebsd.org/changeset/base/226439
 
 Log:
   Place quotes around the output of kbdmap(1), designed to be pasted into
   /etc/rc.conf.
   
   PR:		bin/161711
   Submitted by:	manolis
   MFC after:	1 week
 
 Modified:
   head/usr.sbin/kbdmap/kbdmap.c
 
 Modified: head/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- head/usr.sbin/kbdmap/kbdmap.c	Sun Oct 16 15:55:23 2011	(r226438)
 +++ head/usr.sbin/kbdmap/kbdmap.c	Sun Oct 16 16:05:23 2011	(r226439)
 @@ -289,7 +289,7 @@ do_kbdcontrol(struct keymap *km)
  	if (!x11)
  		system(kbd_cmd);
  
 -	fprintf(stderr, "keymap=%s\n", km->keym);
 +	fprintf(stderr, "keymap=\"%s\"\n", km->keym);
  	free(kbd_cmd);
  }
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
Responsible-Changed-From-To: sysinstall->freebsd-sysinstall 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Oct 16 22:31:29 UTC 2011 
Responsible-Changed-Why:  
Canonicalize assignment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161711 
State-Changed-From-To: open->closed 
State-Changed-By: nwhitehorn 
State-Changed-When: Sun Oct 23 15:25:12 UTC 2011 
State-Changed-Why:  
Changes integrated. Thanks for the patch! This missed RC1, but will be in RC2. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161711 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/161711: commit references a PR
Date: Sun,  6 Nov 2011 16:37:09 +0000 (UTC)

 Author: nwhitehorn
 Date: Sun Nov  6 16:36:54 2011
 New Revision: 227220
 URL: http://svn.freebsd.org/changeset/base/227220
 
 Log:
   MFC r226439:
   Place quotes around the output of kbdmap(1), designed to be pasted into
   /etc/rc.conf.
   
   PR:		bin/161711
   Submitted by:	manolis
   Approved by:	re (kib)
 
 Modified:
   stable/9/usr.sbin/kbdmap/kbdmap.c
 Directory Properties:
   stable/9/usr.sbin/kbdmap/   (props changed)
 
 Modified: stable/9/usr.sbin/kbdmap/kbdmap.c
 ==============================================================================
 --- stable/9/usr.sbin/kbdmap/kbdmap.c	Sun Nov  6 15:58:56 2011	(r227219)
 +++ stable/9/usr.sbin/kbdmap/kbdmap.c	Sun Nov  6 16:36:54 2011	(r227220)
 @@ -289,7 +289,7 @@ do_kbdcontrol(struct keymap *km)
  	if (!x11)
  		system(kbd_cmd);
  
 -	fprintf(stderr, "keymap=%s\n", km->keym);
 +	fprintf(stderr, "keymap=\"%s\"\n", km->keym);
  	free(kbd_cmd);
  }
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
