From 4a3de7387cff550e371de5bdb0ce7daa21176f02 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 29 Mar 2018 18:42:53 +0200 Subject: [PATCH] Update layout --- buildroot-external/configs/ova_defconfig | 2 +- .../{overlay => rootfs-overlay}/etc/rauc/keyring.pem | 0 .../system/etc-NetworkManager-system\\x2dconnections.mount" | 0 .../etc/systemd/system/etc-dropbear.mount | 0 .../etc/systemd/system/getty@tty1.service.d/mingetty.conf | 0 .../etc/systemd/system/getty@tty1.service.d/noclear.conf | 0 .../etc/systemd/system/mnt-boot.mount | 0 .../etc/systemd/system/mnt-data.mount | 0 .../etc/systemd/system/mnt-overlay.mount | 0 .../etc/systemd/system/var-lib-systemd.mount | 0 .../etc/systemd/system/var-log-journal.mount | 0 .../{overlay => rootfs-overlay}/etc/systemd/timesyncd.conf | 0 buildroot-external/rootfs-overlay/mnt/boot/.empty | 0 buildroot-external/rootfs-overlay/mnt/data/.empty | 0 buildroot-external/rootfs-overlay/mnt/overlay/.empty | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename buildroot-external/{overlay => rootfs-overlay}/etc/rauc/keyring.pem (100%) rename "buildroot-external/overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" => "buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/etc-dropbear.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/getty@tty1.service.d/mingetty.conf (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/getty@tty1.service.d/noclear.conf (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/mnt-boot.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/mnt-data.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/mnt-overlay.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/var-lib-systemd.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/system/var-log-journal.mount (100%) rename buildroot-external/{overlay => rootfs-overlay}/etc/systemd/timesyncd.conf (100%) create mode 100644 buildroot-external/rootfs-overlay/mnt/boot/.empty create mode 100644 buildroot-external/rootfs-overlay/mnt/data/.empty create mode 100644 buildroot-external/rootfs-overlay/mnt/overlay/.empty diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 11a2b3230..0845ff29f 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Hass.io" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSIO_PATH)/overlay/" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSIO_PATH)/rootfs-overlay/" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSIO_PATH)/board/ova/post-image.sh" BR2_LINUX_KERNEL=y diff --git a/buildroot-external/overlay/etc/rauc/keyring.pem b/buildroot-external/rootfs-overlay/etc/rauc/keyring.pem similarity index 100% rename from buildroot-external/overlay/etc/rauc/keyring.pem rename to buildroot-external/rootfs-overlay/etc/rauc/keyring.pem diff --git "a/buildroot-external/overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" similarity index 100% rename from "buildroot-external/overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" rename to "buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" diff --git a/buildroot-external/overlay/etc/systemd/system/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/etc-dropbear.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/etc-dropbear.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/etc-dropbear.mount diff --git a/buildroot-external/overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/mingetty.conf diff --git a/buildroot-external/overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf rename to buildroot-external/rootfs-overlay/etc/systemd/system/getty@tty1.service.d/noclear.conf diff --git a/buildroot-external/overlay/etc/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-boot.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/mnt-boot.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/mnt-boot.mount diff --git a/buildroot-external/overlay/etc/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-data.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/mnt-data.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/mnt-data.mount diff --git a/buildroot-external/overlay/etc/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-overlay.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/mnt-overlay.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/mnt-overlay.mount diff --git a/buildroot-external/overlay/etc/systemd/system/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/var-lib-systemd.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/var-lib-systemd.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/var-lib-systemd.mount diff --git a/buildroot-external/overlay/etc/systemd/system/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/var-log-journal.mount similarity index 100% rename from buildroot-external/overlay/etc/systemd/system/var-log-journal.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/var-log-journal.mount diff --git a/buildroot-external/overlay/etc/systemd/timesyncd.conf b/buildroot-external/rootfs-overlay/etc/systemd/timesyncd.conf similarity index 100% rename from buildroot-external/overlay/etc/systemd/timesyncd.conf rename to buildroot-external/rootfs-overlay/etc/systemd/timesyncd.conf diff --git a/buildroot-external/rootfs-overlay/mnt/boot/.empty b/buildroot-external/rootfs-overlay/mnt/boot/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot-external/rootfs-overlay/mnt/data/.empty b/buildroot-external/rootfs-overlay/mnt/data/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot-external/rootfs-overlay/mnt/overlay/.empty b/buildroot-external/rootfs-overlay/mnt/overlay/.empty new file mode 100644 index 000000000..e69de29bb