From 44ccc029e095f6b641a940ff794f6329e4917358 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 30 Mar 2018 01:15:30 +0200 Subject: [PATCH] Update systemd scripts --- buildroot-external/busybox.config | 24 +++++++++---------- .../rootfs-overlay/etc/systemd/journald.conf | 6 +++++ .../etc/systemd/system/hassio-bind.target | 3 +++ ...tworkManager-system\\x2dconnections.mount" | 3 ++- .../etc-dropbear.mount | 4 ++-- .../var-lib-systemd.mount | 2 +- .../var-log-journal.mount | 2 +- .../mnt-boot.mount | 1 + .../mnt-data.mount | 0 .../mnt-overlay.mount | 0 10 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 buildroot-external/rootfs-overlay/etc/systemd/journald.conf create mode 100644 buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target rename "buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" => "buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" (81%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => hassio-bind.target.wants}/etc-dropbear.mount (77%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => hassio-bind.target.wants}/var-lib-systemd.mount (90%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => hassio-bind.target.wants}/var-log-journal.mount (92%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => multi-user.target.wants}/mnt-boot.mount (90%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => multi-user.target.wants}/mnt-data.mount (100%) rename buildroot-external/rootfs-overlay/etc/systemd/system/{ => multi-user.target.wants}/mnt-overlay.mount (100%) diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config index f4b857f16..0382305dd 100644 --- a/buildroot-external/busybox.config +++ b/buildroot-external/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.27.2 -# Thu Mar 29 17:13:16 2018 +# Thu Mar 29 20:23:02 2018 # CONFIG_HAVE_DOT_CONFIG=y @@ -488,11 +488,11 @@ CONFIG_INIT_TERMINAL_TYPE="" # # Login/Password Management Utilities # -# CONFIG_FEATURE_SHADOWPASSWDS is not set +CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_PWD_GRP=y -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_USE_BB_SHADOW=y +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set # CONFIG_ADDGROUP is not set @@ -514,7 +514,7 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" # CONFIG_GETTY is not set CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set -CONFIG_LOGIN_SCRIPTS=y +# CONFIG_LOGIN_SCRIPTS is not set CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y CONFIG_PASSWD=y @@ -835,12 +835,12 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set # CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set # CONFIG_IFUP is not set diff --git a/buildroot-external/rootfs-overlay/etc/systemd/journald.conf b/buildroot-external/rootfs-overlay/etc/systemd/journald.conf new file mode 100644 index 000000000..ae8fa73a9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/journald.conf @@ -0,0 +1,6 @@ +[Journal] +Storage=auto +Compress=yes +SystemMaxUse=8M +RuntimeMaxUse=8M + diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target new file mode 100644 index 000000000..5e10ab7b4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target @@ -0,0 +1,3 @@ +[Unit] +Description=Hassio overlay targets +Documentation=man:systemd.target(5) diff --git "a/buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" similarity index 81% rename from "buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" rename to "buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" index b0ea99942..83db87260 100644 --- "a/buildroot-external/rootfs-overlay/etc/systemd/system/etc-NetworkManager-system\\x2dconnections.mount" +++ "b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-NetworkManager-system\\x2dconnections.mount" @@ -2,6 +2,7 @@ Description=NetworkManager system connections Requires=mnt-overlay.mount After=mnt-overlay.mount +Before=NetworkManager.service [Mount] What=/mnt/overlay/etc/NetworkManager/system-connections @@ -10,4 +11,4 @@ Type=None Options=bind [Install] -WantedBy=multi-user.target +WantedBy=hassio-bind.target diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/etc-dropbear.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount similarity index 77% rename from buildroot-external/rootfs-overlay/etc/systemd/system/etc-dropbear.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount index 25b4e26e7..73a513d0b 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/etc-dropbear.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/etc-dropbear.mount @@ -2,7 +2,7 @@ Description=Dropbear Host Key Requires=mnt-overlay.mount After=mnt-overlay.mount -Before=dropbearkey.service +Before=dropbear.service [Mount] What=/mnt/overlay/etc/dropbear @@ -11,4 +11,4 @@ Type=none Options=bind [Install] -WantedBy=multi-user.target +WantedBy=hassio-bind.target diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/var-lib-systemd.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount similarity index 90% rename from buildroot-external/rootfs-overlay/etc/systemd/system/var-lib-systemd.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount index 308f2f797..38e6a467e 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/var-lib-systemd.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-lib-systemd.mount @@ -13,4 +13,4 @@ Type=None Options=bind [Install] -WantedBy=multi-user.target +WantedBy=hassio-bind.target diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/var-log-journal.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount similarity index 92% rename from buildroot-external/rootfs-overlay/etc/systemd/system/var-log-journal.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount index bdf07c7a0..52900a054 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/var-log-journal.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassio-bind.target.wants/var-log-journal.mount @@ -13,4 +13,4 @@ Type=None Options=bind [Install] -WantedBy=multi-user.target +WantedBy=hassio-bind.target diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount similarity index 90% rename from buildroot-external/rootfs-overlay/etc/systemd/system/mnt-boot.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount index e5a91f29e..38c7f3b82 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-boot.mount +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-boot.mount @@ -2,6 +2,7 @@ Description=Hassio boot partition DefaultDependencies=no Before=umount.target +After=local-fs.target Conflicts=umount.target [Mount] diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/mnt-data.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-data.mount diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount similarity index 100% rename from buildroot-external/rootfs-overlay/etc/systemd/system/mnt-overlay.mount rename to buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/mnt-overlay.mount