initial vm-{net,ssh} features

conf.d/vm.mk

@@ -4,4 +4,10 @@ ifeq (vm,$(IMAGE_CLASS))
 # NB: use/x11 employs some installer-feature packages
 vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:
 
+vm/net: vm/bare use/vm-net/dhcp use/vm-ssh; @:
+
+vm/net-static: vm/bare use/vm-net/static use/vm-ssh
+	@$(call set,VM_NET_IPV4ADDR,10.0.2.16/24)
+	@$(call set,VM_NET_IPV4GW,10.0.2.2)
+
 endif

features.in/Makefile

@@ -30,6 +30,8 @@ endef
 
 else
 
+export BUILDDIR
+
 include $(BUILDDIR)/distcfg.mk
 
 # first rsync what's static, and make backups (*~) --

features.in/build-vm/image-scripts.d/00root

 #!/bin/sh
 
-ROOTPW="${GLOBAL_ROOTPW:-root}"
-
-if type -t chpasswd >&/dev/null; then
-	echo "root:$ROOTPW" | chpasswd
+if [ -n "$GLOBAL_ROOTPW" ]; then
+	if type -t chpasswd >&/dev/null; then
+		echo "root:$GLOBAL_ROOTPW" | chpasswd
+	else
+		echo "** warning: chpasswd binary missing" >&2
+	fi
+else
+	echo "** warning: no root password provided, you're on your own" >&2
 fi

features.in/build-vm/lib/90-build-vm.mk

@@ -11,6 +11,10 @@ IMAGE_PACKAGES = $(SYSTEM_PACKAGES) \
 VM_TARBALL := $(IMAGE_OUTDIR)/$(IMAGE_NAME).tar
 VM_RAWDISK := $(IMAGE_OUTDIR)/$(IMAGE_NAME).raw
 
+ifeq (,$(ROOTPW))
+$(error please provide root password via ROOTPW)
+endif
+
 check-sudo:
 	@if ! type -t sudo >&/dev/null; then \
 		echo "** error: sudo not available, see doc/vm.txt" >&2; \

features.in/cleanup/image-scripts.d/90cleanup-pkgs

 #!/bin/sh -efu
 # remove temporary packages from the installed system
 
+### FIXME: need to proxy CLEANUP_PACKAGES -> GLOBAL_CLEANUP_PACKAGES somewhere
 list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "$list" ] || apt-get remove -f -y  -- $list

features.in/vm-net/README

+Эта фича добавляет базовую поддержку сети в создаваемый образ
+виртуальной машины.  Принимаются предложения по усовершенствованию
+статической конфигурации.

features.in/vm-net/config.mk

+use/vm-net:
+	@$(call add_feature)
+	@$(call add,THE_PACKAGES,etcnet)
+
+use/vm-net/dhcp: use/vm-net
+	@$(call add,THE_PACKAGES,dhcpcd)
+	@$(call set,VM_NET,dhcp)
+
+# need to further add VM_NET_IPV4ADDR and VM_NET_IPV4GW
+use/vm-net/static: use/vm-net
+	@$(call set,VM_NET,static)

features.in/vm-net/generate.mk

+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+all: dir = $(BUILDDIR)/files/etc/net/ifaces/eth0
+all:
+	@write_static() { \
+		echo "$(VM_NET_IPV4ADDR)" > "$(dir)/ipv4address"; \
+		echo "default via $(VM_NET_IPV4GW)" > "$(dir)/ipv4route"; \
+	}; \
+	if [ -n "$(VM_NET)" ] && mkdir -p "$(dir)"; then \
+		case "$(VM_NET)" in \
+		dhcp) ;; \
+		static) write_static;; \
+		*) \
+			echo "** error: unknown value of $(VM_NET)" >&2; \
+			exit 1;; \
+		esac; \
+		{ \
+			echo "TYPE=eth"; \
+			echo "DISABLED=no"; \
+			echo "BOOTPROTO=$(VM_NET)"; \
+		} > "$(dir)/options"; \
+	fi
+
+endif

features.in/vm-ssh/README

+Эта фича предназначена для добавления в образ виртуальной машины
+поддержки SSH: добавляется клиент и конфигурируется сервер
+(требуется задание пути к существующему публичному ключу
+посредством переменной SSH_KEY).
+
+Фактически требует один из вариантов use/vm-net для осмысленности.

features.in/vm-ssh/config.mk

+use/vm-ssh:
+	@$(call add_feature)
+	@$(call add,THE_LISTS,openssh)

features.in/vm-ssh/generate.mk

+ifdef BUILDDIR
+
+include $(BUILDDIR)/distcfg.mk
+
+# prepare the provided public SSH key to be carried over into the VM image
+all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
+all:
+	@if [ -s "$(SSH_KEY)" ]; then \
+		install -pD "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
+	fi
+
+endif

features.in/vm-ssh/image-scripts.d/50-.ssh-perms

+#!/bin/sh
+# tighten up permissions just in case
+
+[ ! -d /root/.ssh ] || chmod 700 /root/.ssh
+[ ! -f /root/.ssh/authorized_keys ] || chmod 600 /root/.ssh/authorized_keys