From patchwork Fri Nov 1 08:55:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 287744 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 754C92C00CE for ; Fri, 1 Nov 2013 19:55:37 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id DD48D3FE20 for ; Fri, 1 Nov 2013 09:55:32 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 0ABCF3F9AF for ; Fri, 1 Nov 2013 09:55:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2364; q=dns/txt; s=ironport1; t=1383296130; x=1414832130; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=KnKgxraE6dlUB2/0XL6a+Ut8oc3tZFVRV09/A4LHUkE=; b=eHcX6emYOSlw7YVCFivi2KpxaR2eNd0e+Q9fvSiSbAEVK7tDxev4/PF6 YuwwCI3ieVi+qn2Tvz9+8y6VX3HUyROWaHyxeMSIzC1mXXZNppHj/lxvi m7g1UedLfGXPiGZWTTw+k5ybeJ+HfWHV4tAZRuov62Y9oPaKhlbkVPegD 8=; X-IronPort-AV: E=Sophos;i="4.93,615,1378850400"; d="scan'208";a="4097049" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 01 Nov 2013 09:55:29 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Fri, 1 Nov 2013 09:55:29 +0100 Received: by localhost (Postfix, from userid 30019) id 161E968160F; Fri, 1 Nov 2013 08:55:28 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: , Subject: [PATCH 1/2] dhcp3: Making support for ro /etc - require /etc/resolv.conf to be a soft link to rw fs Date: Fri, 1 Nov 2013 08:55:26 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 Cc: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/dhcp/dhcp3-3.1-ESV-R3/linux40.patch | 31 +++++++++++++++++++++++++++++ recipes/dhcp/dhcp3.inc | 1 + 2 files changed, 32 insertions(+) create mode 100644 recipes/dhcp/dhcp3-3.1-ESV-R3/linux40.patch diff --git a/recipes/dhcp/dhcp3-3.1-ESV-R3/linux40.patch b/recipes/dhcp/dhcp3-3.1-ESV-R3/linux40.patch new file mode 100644 index 0000000..cd3db92 --- /dev/null +++ b/recipes/dhcp/dhcp3-3.1-ESV-R3/linux40.patch @@ -0,0 +1,31 @@ +--- dhcp-3.1-ESV-R3/client/scripts/linux.org 2013-10-31 11:35:04.054062394 +0100 ++++ dhcp-3.1-ESV-R3/client/scripts/linux 2013-10-31 12:07:22.070005132 +0100 +@@ -24,21 +24,22 @@ + + make_resolv_conf() { + if [ x"$new_domain_name_servers" != x ]; then +- cat /dev/null > /etc/resolv.conf.dhclient +- chmod 644 /etc/resolv.conf.dhclient ++ cat /dev/null > /tmp/$$.resolv.conf.dhclient ++ chmod 644 /tmp/$$.resolv.conf.dhclient + if [ x"$new_domain_search" != x ]; then +- echo search $new_domain_search >> /etc/resolv.conf.dhclient ++ echo search $new_domain_search >> /tmp/$$.resolv.conf.dhclient + elif [ x"$new_domain_name" != x ]; then + # Note that the DHCP 'Domain Name Option' is really just a domain + # name, and that this practice of using the domain name option as + # a search path is both nonstandard and deprecated. +- echo search $new_domain_name >> /etc/resolv.conf.dhclient ++ echo search $new_domain_name >> /tmp/$$.resolv.conf.dhclient + fi + for nameserver in $new_domain_name_servers; do +- echo nameserver $nameserver >>/etc/resolv.conf.dhclient ++ echo nameserver $nameserver >>/tmp/$$.resolv.conf.dhclient + done + +- mv /etc/resolv.conf.dhclient /etc/resolv.conf ++ cp /tmp/$$.resolv.conf.dhclient /etc/resolv.conf ++ rm /tmp/$$.resolv.conf.dhclient + fi + } + diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc index cab53c1..f90667a 100644 --- a/recipes/dhcp/dhcp3.inc +++ b/recipes/dhcp/dhcp3.inc @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://linux30.patch \ + file://linux40.patch \ file://dhclient.conf file://dhcpd.conf" S = "${SRCDIR}/dhcp-${PV}"