X-Original-To: alpine-devel@mail.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id A718FDC9A1C for ; Sun, 11 Oct 2015 15:50:23 +0000 (UTC) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 58F81DC6B1B for ; Sun, 11 Oct 2015 15:50:23 +0000 (UTC) Received: by wicge5 with SMTP id ge5so123124984wic.0 for ; Sun, 11 Oct 2015 08:50:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4Pwu37Ec8Sr9ZteaOFkkB7jKyYG8UviIW8R3jXjFLqw=; b=L3alH34XfSUDQj5yC4cmQFs8BAPGkzz8MFwninanfu0i5LXcayKnc8paEME2zhcKcz 5HDCiVpU0RzQaN56lMHbYvxg3a0FKt0+oyDo3coaYdjKQ3hmeki+72OInXcWath0qpTO z3yJjqPe7/p/8Y4PGtiGao88XtBxRfInMiY9docgnQo02zgqyb2eWkVP116lz3cL53RJ 4wiHsgWL3ZjjyBgHdDOenXy94rApW85TvSN2tOdijLUrahMIvX2DrTDJWsMfj08RrFKM +4tizXI5pEoKllSs/JyToZD2Ods1IobedErC4zEPwcRRWaYElJBwKMvT3GNazatPqFu+ yEGQ== X-Gm-Message-State: ALoCoQmv0s7yItvoeckuc4H+1/3SYgO19+O6A5JyT686LAdY8z842GQdATUaTJlGRu+gOZ1SppKr X-Received: by 10.180.105.66 with SMTP id gk2mr10456344wib.69.1444578621765; Sun, 11 Oct 2015 08:50:21 -0700 (PDT) Received: from localhost (pD9578B12.dip0.t-ipconnect.de. [217.87.139.18]) by smtp.gmail.com with ESMTPSA id it4sm14481371wjb.0.2015.10.11.08.50.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Oct 2015 08:50:20 -0700 (PDT) From: Christian Kampka To: alpine-devel@lists.alpinelinux.org Cc: Christian Kampka Subject: [alpine-devel] [PATCH] mkinitfs: features should be read from $basedir if set Date: Sun, 11 Oct 2015 17:50:07 +0200 Message-Id: <1444578607-15095-2-git-send-email-christian@kampka.net> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444578607-15095-1-git-send-email-christian@kampka.net> References: <1444578607-15095-1-git-send-email-christian@kampka.net> X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- mkinitfs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkinitfs.in b/mkinitfs.in index d2a7890..14c728f 100755 --- a/mkinitfs.in +++ b/mkinitfs.in @@ -184,7 +184,7 @@ done shift $(( $OPTIND - 1 )) . $(readlink -f "$config") -features_dir=${features_dir:-"$sysconfdir/features.d"} +features_dir=${features_dir:-"${basedir%/:-}/${sysconfdir#/}/features.d"} [ -n "$myfeatures" ] && features="$myfeatures" if [ -n "$list_features" ]; then -- 2.6.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---