Merge ~xnox/ubuntu/+source/initramfs-tools:ubuntu/devel into ubuntu/+source/initramfs-tools:ubuntu/devel

[Dimitri John Ledkov]

Correctly serialize previously absent static ip configuration (declared as protocol 'none' by ipconfig) into runtime netplan yaml. LP: #1832042

Correctly serialize previously absent static ip configuration (declared as protocol 'none' by ipconfig) into runtime netplan yaml. LP: #1832042

[Mathieu Trudel-Lapierre (cyphermox)]

Also let's close the original bug from Alkis (I'll find it)

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

> Also let's close the original bug from Alkis (I'll find it)

OKay, it was comments on a different bug and there didn't end up being a separate bug report about this issue in initramfs-tools.

[Dimitri John Ledkov (xnox)]

Ack. I was thinking to just use "none" as well. Happy to do that.

On Fri, 7 Jun 2019, 20:40 Mathieu Trudel-Lapierre, <email address hidden>
wrote:

> Review: Needs Fixing
>
> Also let's close the original bug from Alkis (I'll find it)
>
> Diff comments:
>
> > diff --git a/scripts/functions b/scripts/functions
> > index 511d482..42635bb 100644
> > --- a/scripts/functions
> > +++ b/scripts/functions
> > @@ -501,7 +501,7 @@ _declare_ip_info() {
> > dhcp|dhcp4|dhcp6)
> > echo "dhcp${version}=true"
> > ;;
> > - static)
> > + static|off|none)
>
> I think this should just be "none". ipconfig does not generate "off" or
> "static", just "none". It's not the same as $IP; $PROTO comes straight from
> sourcing the ipconfig output.
>
> > if [ -n "$address" ]; then
> > netprefix=$netmask
> > if [ "$version" = "4" ]; then
>
>
> --
>
> https://code.launchpad.net/~xnox/ubuntu/+source/initramfs-tools/+git/initramfs-tools/+merge/368566
> You are the owner of ~xnox/ubuntu/+source/initramfs-tools:ubuntu/devel.
>

diff --git a/debian/changelog b/debian/changelog
index a32dfcf..dea3cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+initramfs-tools (0.133ubuntu6) UNRELEASED; urgency=medium
+
+  * Add support for creating VLANs via vlan=eth0.1:eth0 on kernel
+    commandline, and as VLAN= conf.d snippet. LP: #1382054
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 08 Jun 2019 00:13:30 +0100
+
 initramfs-tools (0.133ubuntu5) eoan; urgency=medium
 
   * Correctly serialize previously absent static ip configuration
diff --git a/init b/init
index 5174092..426342b 100755
--- a/init
+++ b/init
@@ -55,6 +55,7 @@ export ROOTFLAGS=
 export ROOTFSTYPE=
 export IP=
 export IP6=
+export VLAN=
 export DEVICE=
 export BOOT=
 export BOOTIF=
@@ -148,6 +149,9 @@ for x in $(cat /proc/cmdline); do
 	ip6=*)
 		IP6="${x#ip6=}"
 		;;
+	vlan=*)
+		VLAN="${x#vlan=}"
+		;;
 	boot=*)
 		BOOT=${x#boot=}
 		;;
@@ -340,6 +344,7 @@ unset ROOTDELAY
 unset ROOT
 unset IP
 unset IP6
+unset VLAN
 unset BOOT
 unset BOOTIF
 unset DEVICE
diff --git a/initramfs-tools.7 b/initramfs-tools.7
index 521ec20..65a25da 100644
--- a/initramfs-tools.7
+++ b/initramfs-tools.7
@@ -84,6 +84,12 @@ NFS server than the DHCP server. See Documentation/filesystems/nfsroot.txt
 in any recent Linux source for details. Optional parameter for NFS root.
 
 .TP
+\fB\fI vlan
+tells to create a VLAN tagged device. Allows one to configure one or
+multiple VLAN tagged devices using the "vlan=$name.$id:$parent"
+syntax. E.g. "vlan=eth0.1:eth0" Optional parameter for NFS root.
+
+.TP
 \fB\fI BOOTIF
 is a mac address in pxelinux format with leading "01-" and "-" as separations.
 pxelinux passes mac address of network card used to PXE boot on with this
diff --git a/initramfs.conf.5 b/initramfs.conf.5
index 96e641c..4817519 100644
--- a/initramfs.conf.5
+++ b/initramfs.conf.5
@@ -111,6 +111,11 @@ Specifies the default network interface to use, like eth0.  The \fIip\fP or
 \fIBOOTIF\fP bootargs may override this.
 
 .TP
+\fB VLAN
+Specifies the VLAN tag id to setup, e.g. VLAN=eth0.1:eth0.  The \fIvlan\fP
+bootarg may override this.
+
+.TP
 \fB ROOT
 Allows optional root bootarg hardcoding, when no root bootarg can be passed.
 A root bootarg overrides that special setting.
diff --git a/scripts/functions b/scripts/functions
index 4b2a332..1273e29 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -312,8 +312,12 @@ configure_networking()
 
 	_handle_device_vs_ip
 
+	for v in $VLAN; do
+		VLAN_LINK="$VLAN_LINK ${v##*:}"
+	done
+
 	# activate non-autoconfigured s390x devices
-	for dev in $DEVICE $DEVICE6 $IP6; do
+	for dev in $DEVICE $DEVICE6 $IP6 $VLAN_LINK; do
 		case ${dev} in
 		enc*)
 			zdev=${dev#enc}
@@ -322,6 +326,13 @@ configure_networking()
 		esac
 	done
 
+	for v in $VLAN; do
+		vlink=${v##*:}
+		vname=${v%:*}
+		vid=${vname#*.}
+		ip link add name "$vname" link "$vlink" type vlan id "$vid"
+	done
+
 	wait_for_udev 10
 
 	# support ip options see linux sources
@@ -519,8 +530,12 @@ _declare_ip_info() {
 _render_netplan() {
 	# write a netplan stanza for the given device.
 	local name="$1" mac="$2" dhcp4="$3" dhcp6="$4" addrs="$5" \
-		gateway4="$6" gateway6="$7" ns_addrs="$8" ns_search="$9"
+		gateway4="$6" gateway6="$7" ns_addrs="$8" ns_search="$9" \
+		vlink="${10}" vname="${11}" vid="${12}"
 	local n found=""
+	if [ -n "$vlink" ]; then
+		name=$vlink
+	fi
 	echo "network:"
 	echo "  version: 2"
 	echo "  renderer: networkd"
@@ -531,6 +546,12 @@ _render_netplan() {
 		echo "        macaddress: \"$mac\""
 		echo "      set-name: $name"
 	fi
+	if [ -n "$vname" ]; then
+		echo "  vlans:"
+		echo "    $vname:"
+		echo "      id: $vid"
+		echo "      link: $name"
+	fi
 	if [ -n "$dhcp4" ]; then
 		echo "      dhcp4: $dhcp4"
 		echo "      dhcp-identifier: mac"
@@ -618,6 +639,17 @@ netinfo_to_netplan() {
 		fi
 
 		{
+		for v in $VLAN; do
+			vlink=${v##*:}
+			vname=${v%:*}
+			vid=${vname#*.}
+			if [ "$name" = "$vname" ]; then
+				echo "vlink=$vlink"
+				echo "vname=$vname"
+				echo "vid=$vid"
+				break
+			fi
+		done
 		if [ -n "$DEVICE" ]; then
 			# shellcheck disable=SC2153
 			_declare_ip_info 4 "$PROTO" "$IPV4ADDR" "$IPV4NETMASK" "$IPV4GATEWAY"
@@ -637,9 +669,11 @@ netinfo_to_netplan() {
 	for name in $devices; do
 		local macaddress="" dhcp4="" dhcp6="" addresses=""
 		local gateway4="" gateway6="" ns_addresses="" ns_search=""
+		local vlink="" vname="" vid=""
 		. "$tmpd/$name"
 		_render_netplan "$name" "$macaddress" "$dhcp4" "$dhcp6" "$addresses" \
 			"$gateway4" "$gateway6" "$ns_addresses" "$ns_search" \
+			"$vlink" "$vname" "$vid" \
 			> "${out_d}/$name.yaml"
 	done
 	rm -Rf "$tmpd"
diff --git a/tests/test_netinfo.d/vlan/expected-resolv.conf b/tests/test_netinfo.d/vlan/expected-resolv.conf
new file mode 100644
index 0000000..c5d1458
--- /dev/null
+++ b/tests/test_netinfo.d/vlan/expected-resolv.conf
@@ -0,0 +1,3 @@
+nameserver 192.168.122.1
+nameserver 2001:67c:1562:8010::2:1
+search foo.com example.com ubuntu.com
diff --git a/tests/test_netinfo.d/vlan/net-example1.1.conf b/tests/test_netinfo.d/vlan/net-example1.1.conf
new file mode 100644
index 0000000..ef7008b
--- /dev/null
+++ b/tests/test_netinfo.d/vlan/net-example1.1.conf
@@ -0,0 +1,22 @@
+# VLAN actually comes from vlan= kernel cmdline...
+# ... but this file is sourced, so pretend it was
+# parsed out kernel cmdline
+VLAN=example1.1:example1
+# end of hack
+DEVICE='example1.1'
+PROTO='dhcp'
+IPV4ADDR='192.168.122.89'
+IPV4BROADCAST='192.168.122.255'
+IPV4NETMASK='255.255.255.0'
+IPV4GATEWAY='192.168.122.1'
+IPV4DNS0='192.168.122.1'
+IPV4DNS1='0.0.0.0'
+HOSTNAME='foohost'
+DNSDOMAIN=''
+NISDOMAIN=''
+ROOTSERVER='192.168.122.1'
+ROOTPATH=''
+filename=''
+UPTIME='21'
+DHCPLEASETIME='3600'
+DOMAINSEARCH='foo.com'
diff --git a/tests/test_netinfo.d/vlan/net6-example1.1.conf b/tests/test_netinfo.d/vlan/net6-example1.1.conf
new file mode 100644
index 0000000..c7d3cda
--- /dev/null
+++ b/tests/test_netinfo.d/vlan/net6-example1.1.conf
@@ -0,0 +1,15 @@
+# VLAN actually comes from vlan= kernel cmdline...
+# ... but this file is sourced, so pretend it was
+# parsed out kernel cmdline
+VLAN=example1.1:example1
+# end of hack
+DEVICE6=example1.1
+HOSTNAME=
+DNSDOMAIN=
+IPV6PROTO=dhcp6
+IPV6ADDR=2001:67c:1562:8010:0:1::
+IPV6NETMASK=64
+IPV6DNS0=2001:67c:1562:8010::2:1
+IPV6DOMAINSEARCH="example.com ubuntu.com"
+HOSTNAME=
+DNSDOMAIN=
diff --git a/tests/test_netinfo.d/vlan/netplan/example1.1.yaml b/tests/test_netinfo.d/vlan/netplan/example1.1.yaml
new file mode 100644
index 0000000..7a570fb
--- /dev/null
+++ b/tests/test_netinfo.d/vlan/netplan/example1.1.yaml
@@ -0,0 +1,16 @@
+network:
+  version: 2
+  renderer: networkd
+  ethernets:
+    example1:
+  vlans:
+    example1.1:
+      id: 1
+      link: example1
+      dhcp4: true
+      dhcp-identifier: mac
+      dhcp6: true
+      critical: true
+      nameservers:
+        addresses: ["192.168.122.1", "2001:67c:1562:8010::2:1"]
+        search: ["foo.com", "example.com", "ubuntu.com"]