From 32cc9a67dd6b83271f2f1a1fa806d2457e2991ef Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 4 Mar 2013 00:37:27 +0400 Subject: [PATCH] live, stage2: net-eth moved It would be better to put it into stage2 in the first place but this somehow went over my head; rescue made a reminder. --- conf.d/live.mk | 4 ++-- conf.d/regular.mk | 4 ++-- features.in/live/config.mk | 5 ----- features.in/stage2/config.mk | 5 +++++ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index f2dedad2..a7fa1863 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -10,12 +10,12 @@ distro/syslinux: distro/.init \ use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @: distro/.live-base: distro/.base use/live/base use/power/acpi/button; @: -distro/.live-desktop: distro/.base +live use/live/install use/live/net-eth \ +distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \ use/plymouth/live use/efi; @: distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @: distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \ - use/syslinux/timeout/1 use/cleanup use/efi/signed use/live/net-eth + use/syslinux/timeout/1 use/cleanup use/efi/signed use/stage2/net-eth @$(call add,LIVE_PACKAGES,fonts-ttf-dejavu) @$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common') diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 7095a6c3..25cfc836 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -3,12 +3,12 @@ ifeq (distro,$(IMAGE_CLASS)) # common ground distro/.regular-bare: distro/.base +vmguest +wireless \ - use/efi/signed use/luks use/memtest use/kernel/net + use/efi/signed use/luks use/memtest use/stage2/net-eth use/kernel/net @$(call try,SAVE_PROFILE,yes) # WM base target distro/.regular-base: distro/.regular-bare +live use/live/ru use/live/install \ - use/live/repo use/live/net-eth use/x11/3d-free use/luks use/branding + use/live/repo use/x11/3d-free use/luks use/branding @$(call add,LIVE_LISTS,$(call tags,base regular)) @$(call add,LIVE_LISTS,$(call tags,rescue extra)) @$(call add,THE_BRANDING,indexhtml notes alterator) diff --git a/features.in/live/config.mk b/features.in/live/config.mk index 558737ae..997a49d3 100644 --- a/features.in/live/config.mk +++ b/features.in/live/config.mk @@ -53,8 +53,3 @@ use/live/ru: use/live use/live/sound: use/live @$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa) - -# eth0 instead of enp0s3 -use/live/net-eth: use/live - @$(call add,STAGE1_PACKAGES,udev-rule-generator-net) - @$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth) diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index 46583acf..de4cc475 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -6,6 +6,11 @@ use/stage2: sub/stage1 use/stage2/kms: @$(call add,STAGE1_KMODULES_REGEXP,drm.*) +# eth0 instead of enp0s3 +use/stage2/net-eth: use/stage2 + @$(call add,STAGE1_PACKAGES,udev-rule-generator-net) + @$(call add,STAGE2_PACKAGES,udev-rule-generator-net livecd-net-eth) + # NB: sub/stage2 isn't used standalone but rather # as a base for various livecd modifications # (currently install2, live, rescue)