From 8533f7e2b725d18e9385a74f437494954ffc89f8 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 26 Aug 2014 22:20:22 +0400 Subject: [PATCH] net-eth: added plus-shortcut "use/stage2/net-eth use/net-eth" would be common enough for installers or livecd images to just get these pulled in together by a convenient shortcut thus reducing confusion and chances to just forget one of these counterparts. --- features.in/net-eth/README | 3 +++ features.in/net-eth/config.mk | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/features.in/net-eth/README b/features.in/net-eth/README index 9e2531bb..c3431d5c 100644 --- a/features.in/net-eth/README +++ b/features.in/net-eth/README @@ -5,3 +5,6 @@ udev-rule-generator-net штатно добавляется для обеспе сломали в апстримном systemd-udevd; для генерируемых "на лету" следует применять конфигурирование времени загрузки (NM, connman либо пакет livecd-net-eth). + +Обратите внимание: применение в инсталяторах требует задействования +как use/net-eth, так и use/stage2/net-eth; +net-eth "подберёт" оба. diff --git a/features.in/net-eth/config.mk b/features.in/net-eth/config.mk index 1902eba8..6fe60283 100644 --- a/features.in/net-eth/config.mk +++ b/features.in/net-eth/config.mk @@ -1,11 +1,13 @@ +# NB: this is aimed at LiveCD/installer images ++net-eth: use/net-eth use/stage2/net-eth + +# see also use/stage2/net-eth; do not depend on it though +# as stage2-less images need preconfigured networking too use/net-eth: use/net @$(call add_feature) @$(call xport,NET_ETH) @$(call add,BASE_PACKAGES,udev-rule-generator-net) -# see also use/stage2/net-eth; do not depend on it though -# as stage2-less images need preconfigured networking too - # typical boilerplate use/net-eth/dhcp: use/net-eth use/net/dhcp @$(call add,NET_ETH,eth0:dhcp)