From owner-svn-soc-all@FreeBSD.ORG Mon Aug 18 18:18:20 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F2D4404 for ; Mon, 18 Aug 2014 18:18:20 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AE3B347D for ; Mon, 18 Aug 2014 18:18:20 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IIIKw3091931 for ; Mon, 18 Aug 2014 18:18:20 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7IIIJ6x091797 for svn-soc-all@FreeBSD.org; Mon, 18 Aug 2014 18:18:19 GMT (envelope-from kczekirda@FreeBSD.org) Date: Mon, 18 Aug 2014 18:18:19 GMT Message-Id: <201408181818.s7IIIJ6x091797@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r272634 - soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 18:18:20 -0000 Author: kczekirda Date: Mon Aug 18 18:18:19 2014 New Revision: 272634 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272634 Log: other fixes Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/conf/rc.local.sample Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/conf/rc.local.sample ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/conf/rc.local.sample Mon Aug 18 18:18:15 2014 (r272633) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/conf/rc.local.sample Mon Aug 18 18:18:19 2014 (r272634) @@ -50,7 +50,7 @@ method="installerconfig" fi -preseed=$( awk '/bootfile-name/{sub(/;/,"",$3);print $3;exit}' \ +preseed=$( awk '/bootfile-name/{gsub(/"|;/,"",$3);print $3;exit}' \ /var/db/dhclient.leases.* ) if [ "$preseed" ]; then @@ -59,7 +59,7 @@ # default config fetch "$preseed"/default -o "$input.default" - if [ "$( head -n "$input.default" )" = "#!fai" ]; then + if [ "$( head -n 1 "$input.default" )" = "#!fai" ]; then method="default" fi