Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit dbe1d17d authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

desktop.mk, vm.mk: just use/net-eth

No need to require udev-rule-generator-net explicitly here, it's been factored out into that feature.
parent 02e484af
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
conf.d/desktop.mk
View file @ dbe1d17d
...@@ -6,9 +6,9 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg ...@@ -6,9 +6,9 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @: distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
mixin/desktop-installer: use/x11-autostart use/sound +vmguest mixin/desktop-installer: use/x11-autostart use/net-eth use/sound +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo) @$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd) @$(call add,BASE_PACKAGES,sysklogd)
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network))) $(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
......
conf.d/vm.mk
View file @ dbe1d17d
...@@ -5,7 +5,7 @@ vm/bare: vm/.bare +sysvinit ...@@ -5,7 +5,7 @@ vm/bare: vm/.bare +sysvinit
@$(call add,BASE_PACKAGES,apt) @$(call add,BASE_PACKAGES,apt)
vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su vm/net: vm/bare use/net-eth/dhcp use/net-ssh use/repo use/control/sudo-su
@$(call add,BASE_PACKAGES,su udev-rule-generator-net) @$(call add,BASE_PACKAGES,su)
# NB: use/x11 employs some installer-feature packages # NB: use/x11 employs some installer-feature packages
vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @: vm/.desktop-bare: vm/net use/x11/xorg use/cleanup/installer use/repo; @:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment