From 6889a65ebd45e7c813e2172037c73d85e2a689c0 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 25 Jun 2013 17:11:05 +0000 Subject: [PATCH] armh.mk: use those new and shiny features for cubox Some of those were long asking to be done but cubox project managed to actually get them done at least to the extent needed for it; so let's land those and prune things up a bit. --- conf.d/armh.mk | 10 ++--- .../armh/rootfs/image-scripts.d/50-network | 37 +------------------ 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/conf.d/armh.mk b/conf.d/armh.mk index d9de4940..617bdb2a 100644 --- a/conf.d/armh.mk +++ b/conf.d/armh.mk @@ -29,7 +29,7 @@ endif ifeq (vm,$(IMAGE_CLASS)) # NB: early dependency on use/kernel is on intent -vm/.arm-base: profile/bare use/kernel use/vm-net/dhcp use/vm-ssh; @: +vm/.arm-base: profile/bare use/kernel use/net-eth/dhcp use/vm-ssh; @: @$(call add,BASE_PACKAGES,interactivesystem e2fsprogs) @$(call add,BASE_PACKAGES,apt) @$(call add,BASE_PACKAGES,mkinitrd uboot-tools) @@ -49,16 +49,16 @@ vm/.cubox-bare: vm/.arm-base use/armh use/armh-cubox use/services/ssh \ @$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular)) vm/.cubox-base: vm/.cubox-bare use/deflogin/altlinuxroot; @: -vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk; @: +vm/.cubox-gtk: vm/.cubox-base use/x11/lightdm/gtk +nm; @: -vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares; @: +vm/cubox-xfce: vm/.cubox-bare use/slinux/arm use/oem use/net-usershares \ + use/domain-client vm/cubox-xfce-ru: vm/.cubox-gtk use/slinux/arm use/x11-autologin @$(call add,BASE_PACKAGES,livecd-ru) @$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru) -vm/cubox-mate: vm/.cubox-gtk use/x11/mate - @$(call add,BASE_LISTS,$(call tags,desktop nm)) +vm/cubox-mate: vm/.cubox-gtk use/x11/mate +nm; @: endif diff --git a/features.in/armh/rootfs/image-scripts.d/50-network b/features.in/armh/rootfs/image-scripts.d/50-network index cc12006c..683b41bc 100755 --- a/features.in/armh/rootfs/image-scripts.d/50-network +++ b/features.in/armh/rootfs/image-scripts.d/50-network @@ -34,40 +34,7 @@ DOMAINNAME="localdomain" HOSTNAME="localhost.localdomain" verbose "Init /etc/hosts with 127.0.0.1 localhost" -/bin/echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts +echo "127.0.0.1 localhost localhost.localdomain" > /etc/hosts verbose "Truncate /etc/resolv.conf" -/bin/echo nameserver 8.8.8.8 >/etc/resolv.conf - -chkconfig network on - -netcfg="/etc/sysconfig/network" - -verbose "Enable networking, disable FORWARD_IPV4, set hostname to $HOSTNAME, domainname to $DOMAINNAME" -shell_config_set "$netcfg" NETWORKING yes -shell_config_set "$netcfg" FORWARD_IPV4 false -shell_config_set "$netcfg" HOSTNAME "$HOSTNAME" -shell_config_set "$netcfg" DOMAINNAME "$DOMAINNAME" - -if [ -x /etc/init.d/connmand ]; then - verbose "Enable connmand and finish" - chkconfig --add connmand && chkconfig connmand on - exit 0 -fi - -verbose "Setup defaults for NetworkManager" - -shell_config_set /etc/net/ifaces/default/options-eth BOOTPROTO dhcp - -if [ -f /usr/sbin/NetworkManager ] ; then - chkconfig --add NetworkManager && chkconfig NetworkManager on - shell_config_set /etc/net/ifaces/default/options-eth NM_CONTROLLED yes - shell_config_set /etc/net/ifaces/default/options-eth DISABLED yes - #subst 's/NM_CONTROLLED=no/NM_CONTROLLED=yes/' /etc/net/ifaces/*/options ||: -else - verbose "Did you install NetworkManager? Can't find them." - # Don't assign configuration to interfaces, untill ifplugd detects cable presence - subst 's/USE_IFPLUGD=no/USE_IFPLUGD=yes/' /etc/net/ifaces/default/options-eth -fi - -verbose "finished" +echo nameserver 8.8.8.8 >/etc/resolv.conf