From patchwork Fri Mar 10 20:01:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nl6720 via arch-releng X-Patchwork-Id: 62 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id oY4/LRsGw1j0MgAAtiB/HQ for ; Fri, 10 Mar 2017 21:01:31 +0100 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id B776840159; Fri, 10 Mar 2017 21:01:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Fri, 10 Mar 2017 21:01:30 +0100 (CET) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 754752B073; Fri, 10 Mar 2017 20:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1489176090; bh=P8YwmcTPF5eG2jo7NPTgqI30eE+gFEH2x8tZOL7Rymo=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=Cdg7gOuj8hjhkO5YuyuXYkmxvBNddTf0qlNzDznw4qpFDyZvviDktv6Tt/2pKpmC9 Qw0zABwA4SzP+ysTzQgXMv8bT3xMaoMFEyMLHYsYxFlVf2alp/HoNOeODp0uB/XZCy a5a4EEd+aLHTJeLajXbFx4xLnEjvUbm9jdWhUEmgWsTOBQXF8iJB04gKPG/y8EXCOd ploYDLI77ZCE9Nz21grqUyPcFlbcPIgPgb8hqO9KYqkCMcMJUtrag7hodUFnEuCg6X d2YmPXbUX9ssFZdtXv94D9rS1z5As3CV9is5kUPtLdTEJsrI8dv3glT9fR1v5CpHP8 g3pViMMjorkxB6z39y0I1R2U25jjmTmq0iadbFNbUxYxDYRJhxwpEWl1MpUkXP1P+s UCL7QpMHqP4wgMmlOrQlQTNJCYOFsuBYaElW4CdPEoq/e623QDQkKq6Zbck3xTBZUy KzHlbMefdDaycyvs83qhJskyzeBv7aewq1iPe8b50fWencVHf2/bqUpE5x3qGpMDf6 TJBetBvfYu/H//tpOu0BEudlgEueQ9WLm3V0YF/pj3POsY6tTISg8q1YG4Z4DeEDa8 khB4JT/jhLPL64TOeFNTvw7qU8Dj3edzKR4eVGOOQhjy/xgFeukrffGs95FfTjtYG9 GJDHPYY2QEA1i1QcN9t3CeLc= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E22352A472 for ; Fri, 10 Mar 2017 20:01:24 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [IPv6:2a00:1828:2000:547::2]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 10 Mar 2017 20:01:24 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 6349940159 for ; Fri, 10 Mar 2017 21:01:23 +0100 (CET) Received: from mail-oi0-x22e.google.com (mail-oi0-x22e.google.com [IPv6:2607:f8b0:4003:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Fri, 10 Mar 2017 21:01:23 +0100 (CET) Received: by mail-oi0-x22e.google.com with SMTP id 2so56179649oif.0 for ; Fri, 10 Mar 2017 12:01:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VaR2GAo4kahChLB9FzKz190JWTBqifKe9Pxp7T5OB2c=; b=Nbd9x9uvSQh2INBJ24Sp1Ewv9lGG3rZvB7RZmgQAS3OdCYbprwU/6vCKiz0abduE5K kZQRpO4fpx8x5iUwru6klktDsjHGE32Edv3r0vB+Ht4BOL46XIcQHAwjKdjEBxZmocwP CaYcDiboicCZ/lJ42X2aDbrB5aTBhI+iPEx/+3xsGNO6KKmJXZEJ+zLobCZfs96ko9Hb 35Yfjna3S0AITmLD27PquAcypLOSaVnXQokiNxxjqrHazftNwDLvpN5mcPL9XFqmVZx0 55zHDkyVHFChJIKhasovoqaVlRKeuhuR1qh8LoWNyLORC6Ks6g1xxezp0E8lSuFcLNSZ sxBw== X-Gm-Message-State: AMke39m/ANZymVvsgvetO8fjmK0u/Bwv7wovCOHM11IaqyT/L4k2oNQcP8yfgXhZw5wrww== X-Received: by 10.202.102.91 with SMTP id a88mr11310667oic.23.1489176081379; Fri, 10 Mar 2017 12:01:21 -0800 (PST) Received: from thurstybook.ad.raineyelectronics.com (24-35-221-228.fidnet.com. [24.35.221.228]) by smtp.gmail.com with ESMTPSA id h10sm4674859oia.41.2017.03.10.12.01.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Mar 2017 12:01:20 -0800 (PST) To: arch-releng@archlinux.org Date: Fri, 10 Mar 2017 14:01:05 -0600 Message-Id: <20170310200106.6678-1-thurstylark@gmail.com> X-Mailer: git-send-email 2.11.1 Subject: [arch-releng] [PATCH 1/2] [archiso_pxe_common] Add timeout to ipconfig call X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: David Thurstenson via arch-releng Reply-To: Arch Linux Release Engineering Cc: thurstylark@gmail.com Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" X-UID: 166 Status: X-Keywords: Content-Length: 841 From: David Thurstenson Signed-off-by: David Thurstenson --- archiso/initcpio/hooks/archiso_pxe_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index 422e4f7..96a10c5 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -26,7 +26,7 @@ run_hook () { fi # setup network and save some values - if ! ipconfig "ip=${ip}"; then + if ! ipconfig -t 20 "ip=${ip}"; then echo "ERROR; Failed to configure network" echo " Falling back to interactive prompt" echo " You can try to fix the problem manually, log out when you are finished" From patchwork Fri Mar 10 20:01:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nl6720 via arch-releng X-Patchwork-Id: 61 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id b0hOORkGw1j0MgAAtiB/HQ for ; Fri, 10 Mar 2017 21:01:29 +0100 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 70756404EA; Fri, 10 Mar 2017 21:01:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Fri, 10 Mar 2017 21:01:28 +0100 (CET) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2F18E2B05E; Fri, 10 Mar 2017 20:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1489176088; bh=RcRWUO+C1lTqxo7q2Sy//CWwLNw6Sd8QpTjXDrJ6Jmg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc; b=AHoDqZCKbA5eSEw+O9ihWAYm2sesLkUo6s0LeoRUL8dqptJBdYzwt/ou2mB8QqSab cVDdR06uYUIKlCmMuP3Rpl6jWJtIiYPEP+A8y4z2GZVX9/Ux0qLvBNS0BZm0+wAgJS 7FXWvP91M06FCxitSktkJufzncoe72yt/sAJOy6NY8evC8DnwpThznZJTBUWHCp3A5 LfmgNS0ylnuB4fhVtZORRfQgGWkLSXPIvuUR/gL1d3Ql6osIRc8R9REQhfi1DhpqiK VnigZgyTS7ydSXcC9lHlbBVhZehPoJVty4mPHlW8T8Uc+u0gC2bR649nHxWEYLMFj4 utRmiMa/VAndsQfr4i9DhqFRiWlMdDO1io4M2pvUik0katpGVObCT9SReFmMPoZ9M+ B9wHIN7LgmzaOm8CoHBZK25f7SEGmozzWzjgs1Z0kngfOzUdWnYwzuv0foNKhHnapu c05QmRgexKKIZojzyCWljv9lo91XpI4HqUULvXBdGqFhs/A35jien/fdeCqVsBQcoX krw8/d5pEzGRdHIv/DYJMM4MimytzAw6aK48n70atJBCvGQQTm9KoD/LtnU/DaXWHB OaEQ+hclcZ56hlbP8UJXq0h76z3WC5XuF7aVwENBxwfS/tlq/voAROabheWLr38MU8 oW7amF1lzchxYi/6XZ1W+tuA= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D25392B051 for ; Fri, 10 Mar 2017 20:01:25 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [89.238.67.251]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 10 Mar 2017 20:01:25 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 7E5F4404EA for ; Fri, 10 Mar 2017 21:01:24 +0100 (CET) Received: from mail-ot0-x243.google.com (mail-ot0-x243.google.com [IPv6:2607:f8b0:4003:c0f::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Fri, 10 Mar 2017 21:01:24 +0100 (CET) Received: by mail-ot0-x243.google.com with SMTP id 19so11025380oti.0 for ; Fri, 10 Mar 2017 12:01:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uThySg7AQjkXi2yGTsXLsz5KxN5Fy4pcXvmhMGk3dGs=; b=eO+Pdh/VEA3nKOf8Ry7aNDwqI48JgP/WAtDzHlvvLJy1uDzoRpmiQEIloM6nTqs18/ jXfLuT+uFLt1EVykYU0uSW1+8XquJIBUnwmHFHfdDQt00jijS7aOXkUx/XLYOKPPG1X4 NqIJHOKPNPlDfvLZZJuEUXtxi/WKIMXfWDYyYUiV4oodJqSTXvlCltHKBJBkeH9MeP20 OZ/1jlvyrn8n9t/c7yAhKqJ3QUBzXwwIcpXjJXz9qhuDfS6exhDoe6AatH8oU6oDXpns UBfDXPhQMwxFXow5daIxOdRkMc/G2e7ygxT05Af1PUtmA0RoPNUUklsfzb/zrmO8Thsu ivXw== X-Gm-Message-State: AMke39k27Tzw5EkmB63pu9AIuQxU94UqU+5uq6OKuaXbsOiD27cvrtpPzbK846pXcguwdw== X-Received: by 10.157.3.82 with SMTP id 76mr12721661otv.101.1489176082670; Fri, 10 Mar 2017 12:01:22 -0800 (PST) Received: from thurstybook.ad.raineyelectronics.com (24-35-221-228.fidnet.com. [24.35.221.228]) by smtp.gmail.com with ESMTPSA id h10sm4674859oia.41.2017.03.10.12.01.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Mar 2017 12:01:22 -0800 (PST) To: arch-releng@archlinux.org Date: Fri, 10 Mar 2017 14:01:06 -0600 Message-Id: <20170310200106.6678-2-thurstylark@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170310200106.6678-1-thurstylark@gmail.com> References: <20170310200106.6678-1-thurstylark@gmail.com> Subject: [arch-releng] [PATCH 2/2] [archiso_pxe_common] Handle case where ip=dhcp X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: David Thurstenson via arch-releng Reply-To: Arch Linux Release Engineering Cc: thurstylark@gmail.com Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" X-UID: 165 Status: X-Keywords: Content-Length: 801 From: David Thurstenson Signed-off-by: David Thurstenson --- archiso/initcpio/hooks/archiso_pxe_common | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index 96a10c5..2380ca3 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -22,7 +22,11 @@ run_hook () { break fi done - ip="${ip}::${bootif_dev}" + if [[ "${ip}" == "dhcp" ]]; then + ip=":::::${bootif_dev}:dhcp" + else + ip="${ip}::${bootif_dev}" + fi fi # setup network and save some values