From: Jan Kiszka <[email protected]> In bullseye, this file is gone, and simply removing it from the target image helps to deal with missing ttys for all targets.
Signed-off-by: Jan Kiszka <[email protected]> --- recipes-core/customizations/customizations.bb | 5 +---- .../files/{postinst-common => postinst} | 5 ++++- .../customizations/files/postinst-espressobin | 13 ------------- recipes-core/customizations/files/postinst-hikey620 | 1 - recipes-core/customizations/files/postinst-ipc127e | 1 - .../customizations/files/postinst-macchiatobin | 1 - recipes-core/customizations/files/postinst-nuc6cay | 1 - .../customizations/files/postinst-orangepi-zero | 1 - .../customizations/files/postinst-pine64-plus | 1 - .../customizations/files/postinst-qemu-amd64 | 1 - .../customizations/files/postinst-qemu-arm64 | 1 - recipes-core/customizations/files/postinst-rpi4 | 1 - .../customizations/files/postinst-ultra96-v1 | 12 ------------ .../customizations/files/postinst-ultra96-v2 | 1 - 14 files changed, 5 insertions(+), 40 deletions(-) rename recipes-core/customizations/files/{postinst-common => postinst} (82%) delete mode 100644 recipes-core/customizations/files/postinst-espressobin delete mode 100644 recipes-core/customizations/files/postinst-hikey620 delete mode 100644 recipes-core/customizations/files/postinst-ipc127e delete mode 100644 recipes-core/customizations/files/postinst-macchiatobin delete mode 100644 recipes-core/customizations/files/postinst-nuc6cay delete mode 100644 recipes-core/customizations/files/postinst-orangepi-zero delete mode 100644 recipes-core/customizations/files/postinst-pine64-plus delete mode 100644 recipes-core/customizations/files/postinst-qemu-amd64 delete mode 100644 recipes-core/customizations/files/postinst-qemu-arm64 delete mode 100644 recipes-core/customizations/files/postinst-rpi4 delete mode 100644 recipes-core/customizations/files/postinst-ultra96-v1 delete mode 120000 recipes-core/customizations/files/postinst-ultra96-v2 diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb index 313c6d2..f71a078 100644 --- a/recipes-core/customizations/customizations.bb +++ b/recipes-core/customizations/customizations.bb @@ -19,8 +19,7 @@ include local.inc DESCRIPTION = "demo image customizations" SRC_URI = " \ - file://postinst-common \ - file://postinst-${MACHINE} \ + file://postinst \ file://.bash_history-${MACHINE} \ file://e1000e-intx.conf \ file://ethernet \ @@ -50,6 +49,4 @@ do_install() { install -v -d -m 700 ${D}/root/.ssh install -v -m 644 ${WORKDIR}/known_hosts ${D}/root/.ssh/ - - cat ${WORKDIR}/postinst-common ${WORKDIR}/postinst-${MACHINE} > ${WORKDIR}/postinst } diff --git a/recipes-core/customizations/files/postinst-common b/recipes-core/customizations/files/postinst similarity index 82% rename from recipes-core/customizations/files/postinst-common rename to recipes-core/customizations/files/postinst index 18b9568..cbf451f 100644 --- a/recipes-core/customizations/files/postinst-common +++ b/recipes-core/customizations/files/postinst @@ -2,7 +2,7 @@ # # Jailhouse, a Linux-based partitioning hypervisor # -# Copyright (c) Siemens AG, 2018 +# Copyright (c) Siemens AG, 2018-2020 # # Authors: # Jan Kiszka <[email protected]> @@ -23,3 +23,6 @@ sed -i ':restart /\\$/N;s/\\\n[ ]*//;t restart' /root/.bash_history echo "PermitRootLogin yes" >> /etc/ssh/sshd_config echo "demo" > /etc/hostname + +# this helps with ttys not know to this file (removed upstream with bullseye) +rm -f /etc/securetty diff --git a/recipes-core/customizations/files/postinst-espressobin b/recipes-core/customizations/files/postinst-espressobin deleted file mode 100644 index 4b446a2..0000000 --- a/recipes-core/customizations/files/postinst-espressobin +++ /dev/null @@ -1,13 +0,0 @@ -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2018 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -# workaround for Debian Bug#879903 -echo "ttyMV0" >> /etc/securetty diff --git a/recipes-core/customizations/files/postinst-hikey620 b/recipes-core/customizations/files/postinst-hikey620 deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-hikey620 +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-ipc127e b/recipes-core/customizations/files/postinst-ipc127e deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-ipc127e +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-macchiatobin b/recipes-core/customizations/files/postinst-macchiatobin deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-macchiatobin +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-nuc6cay b/recipes-core/customizations/files/postinst-nuc6cay deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-nuc6cay +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-orangepi-zero b/recipes-core/customizations/files/postinst-orangepi-zero deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-orangepi-zero +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-pine64-plus b/recipes-core/customizations/files/postinst-pine64-plus deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-pine64-plus +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-qemu-amd64 b/recipes-core/customizations/files/postinst-qemu-amd64 deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-qemu-amd64 +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-qemu-arm64 b/recipes-core/customizations/files/postinst-qemu-arm64 deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-qemu-arm64 +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-rpi4 b/recipes-core/customizations/files/postinst-rpi4 deleted file mode 100644 index 2dde661..0000000 --- a/recipes-core/customizations/files/postinst-rpi4 +++ /dev/null @@ -1 +0,0 @@ -# Nothing to do diff --git a/recipes-core/customizations/files/postinst-ultra96-v1 b/recipes-core/customizations/files/postinst-ultra96-v1 deleted file mode 100644 index b23b885..0000000 --- a/recipes-core/customizations/files/postinst-ultra96-v1 +++ /dev/null @@ -1,12 +0,0 @@ -# -# Jailhouse, a Linux-based partitioning hypervisor -# -# Copyright (c) Siemens AG, 2018 -# -# Authors: -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -echo "ttyPS0" >> /etc/securetty diff --git a/recipes-core/customizations/files/postinst-ultra96-v2 b/recipes-core/customizations/files/postinst-ultra96-v2 deleted file mode 120000 index 1bc8b3c..0000000 --- a/recipes-core/customizations/files/postinst-ultra96-v2 +++ /dev/null @@ -1 +0,0 @@ -postinst-ultra96-v1 \ No newline at end of file -- 2.26.2 -- 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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/6d96ab6e-d12e-2dbb-beb2-e0cbfb17547c%40siemens.com.
