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.
This commit is contained in:
parent
07d58b91cc
commit
32cc9a67dd
@ -10,12 +10,12 @@ distro/syslinux: distro/.init \
|
|||||||
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
|
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
|
||||||
|
|
||||||
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
|
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; @:
|
use/plymouth/live use/efi; @:
|
||||||
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
|
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
|
||||||
|
|
||||||
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
|
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,LIVE_PACKAGES,fonts-ttf-dejavu)
|
||||||
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
|
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
|
||||||
|
|
||||||
|
@ -3,12 +3,12 @@ ifeq (distro,$(IMAGE_CLASS))
|
|||||||
|
|
||||||
# common ground
|
# common ground
|
||||||
distro/.regular-bare: distro/.base +vmguest +wireless \
|
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)
|
@$(call try,SAVE_PROFILE,yes)
|
||||||
|
|
||||||
# WM base target
|
# WM base target
|
||||||
distro/.regular-base: distro/.regular-bare +live use/live/ru use/live/install \
|
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,base regular))
|
||||||
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
|
@$(call add,LIVE_LISTS,$(call tags,rescue extra))
|
||||||
@$(call add,THE_BRANDING,indexhtml notes alterator)
|
@$(call add,THE_BRANDING,indexhtml notes alterator)
|
||||||
|
@ -53,8 +53,3 @@ use/live/ru: use/live
|
|||||||
|
|
||||||
use/live/sound: use/live
|
use/live/sound: use/live
|
||||||
@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)
|
@$(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)
|
|
||||||
|
@ -6,6 +6,11 @@ use/stage2: sub/stage1
|
|||||||
use/stage2/kms:
|
use/stage2/kms:
|
||||||
@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
|
@$(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
|
# NB: sub/stage2 isn't used standalone but rather
|
||||||
# as a base for various livecd modifications
|
# as a base for various livecd modifications
|
||||||
# (currently install2, live, rescue)
|
# (currently install2, live, rescue)
|
||||||
|
Loading…
Reference in New Issue
Block a user