From 76df206685825d1d6af7c4cca6ec6f3fd8f898e2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 6 Jun 2013 12:27:19 +0200
Subject: [PATCH] cms/cmssetup.sh: do not echo newlines for ccw.conf

https://bugzilla.redhat.com/show_bug.cgi?id=970982
---
 modules.d/80cms/cmssetup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index e6daa07..7d5f25c 100755
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -148,9 +148,9 @@ processcmsfile()
     if [[ $NETTYPE ]]; then
 	(
 	    echo -n $NETTYPE,$SUBCHANNELS
-	    [[ $PORTNAME ]] && echo ",portname=$PORTNAME"
-	    [[ $LAYER2 ]] && echo ",layer2=$LAYER"
-	    [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo ",protocol=$CTCPROT"
+	    [[ $PORTNAME ]] && echo -n ",portname=$PORTNAME"
+	    [[ $LAYER2 ]] && echo -n ",layer2=$LAYER"
+	    [[ "$NETTYPE" = "ctc" ]] && [[ $CTCPROT ]] && echo -n ",protocol=$CTCPROT"
 	    echo
 	) >> /etc/ccw.conf
 
-- 
2.7.4