From: Jan Kiszka <jan.kis...@siemens.com> Move all Ethernet-related interface configurations in to a single file. This should make it easier to keep overview what is already there and what might have to be added for new targets.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com> --- recipes-core/customizations/customizations.bb | 6 ++---- recipes-core/customizations/files/e1000e | 3 --- recipes-core/customizations/files/ethernet | 8 ++++++++ recipes-core/customizations/files/virtio-net | 3 --- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 recipes-core/customizations/files/e1000e create mode 100644 recipes-core/customizations/files/ethernet delete mode 100644 recipes-core/customizations/files/virtio-net diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index 90359b5..112a078 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -20,8 +20,7 @@ SRC_URI = " \ file://postinst-${MACHINE} \ file://.bash_history-${MACHINE} \ file://e1000e-intx.conf \ - file://e1000e \ - file://virtio-net \ + file://ethernet \ file://ivshmem-net \ file://known_hosts \ file://99-silent-printk.conf \ @@ -39,8 +38,7 @@ do_install() { install -v -m 644 ${WORKDIR}/e1000e-intx.conf ${D}/etc/modprobe.d/ install -v -d ${D}/etc/network/interfaces.d - install -v -m 644 ${WORKDIR}/e1000e ${D}/etc/network/interfaces.d/ - install -v -m 644 ${WORKDIR}/virtio-net ${D}/etc/network/interfaces.d/ + install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/ install -v -m 644 ${WORKDIR}/ivshmem-net ${D}/etc/network/interfaces.d/ install -v -d ${D}/etc/sysctl.d diff --git a/recipes-core/customizations/files/e1000e b/recipes-core/customizations/files/e1000e deleted file mode 100644 index 3f79126..0000000 --- a/recipes-core/customizations/files/e1000e +++ /dev/null @@ -1,3 +0,0 @@ -allow-hotplug enp0s2 - -iface enp0s2 inet dhcp diff --git a/recipes-core/customizations/files/ethernet b/recipes-core/customizations/files/ethernet new file mode 100644 index 0000000..237f8c5 --- /dev/null +++ b/recipes-core/customizations/files/ethernet @@ -0,0 +1,8 @@ +allow-hotplug eth0 +allow-hotplug enp0s2 + +# used on qemuarm64 and orangepi-zero +iface eth0 inet dhcp + +# used on qemuamd64 +iface enp0s2 inet dhcp diff --git a/recipes-core/customizations/files/virtio-net b/recipes-core/customizations/files/virtio-net deleted file mode 100644 index 402f90b..0000000 --- a/recipes-core/customizations/files/virtio-net +++ /dev/null @@ -1,3 +0,0 @@ -allow-hotplug eth0 - -iface eth0 inet dhcp -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to jailhouse-dev+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.