From cb5343a6fa7713f5a0f6360420a9f6095821d8cb Mon Sep 17 00:00:00 2001 From: Bryan Berg Date: Mon, 28 Jan 2019 00:58:40 -0800 Subject: [PATCH] Migrate from LABEL= to /dev/disk/by-label/* (#318) --- .../hassos-user-rules-udev-trigger.service | 1 + .../lib/systemd/system/etc-udev-rules.d.mount | 2 +- .../lib/systemd/system/hassos-expand.service | 2 ++ .../hassos-user-rules-udev-trigger.service | 17 +++++++++++++++++ .../usr/lib/systemd/system/mnt-boot.mount | 2 +- .../usr/lib/systemd/system/mnt-config.mount | 2 +- .../usr/lib/systemd/system/mnt-data.mount | 2 +- .../usr/lib/systemd/system/mnt-overlay.mount | 2 +- 8 files changed, 25 insertions(+), 5 deletions(-) create mode 120000 buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service new file mode 120000 index 000000000..b41d47acb --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount index 5e6badb81..648eea2f6 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-udev-rules.d.mount @@ -2,7 +2,7 @@ Description=Udev persistent rules.d Requires=mnt-overlay.mount After=mnt-overlay.mount -Before=systemd-udevd.service hassos-config.service +Before=hassos-config.service [Mount] What=/mnt/overlay/etc/udev/rules.d diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service index 07e453bde..afa6a1eff 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service @@ -4,6 +4,8 @@ DefaultDependencies=no Before=mnt-data.mount RefuseManualStart=true RefuseManualStop=true +Requires=dev-disk-by\x2dlabel-hassos\x2ddata.device +After=dev-disk-by\x2dlabel-hassos\x2ddata.device [Service] Type=oneshot diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service new file mode 100644 index 000000000..53ee8a3ac --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service @@ -0,0 +1,17 @@ +[Unit] +Description=Retrigger udev rules after user rules mounted +DefaultDependencies=no +Wants=systemd-udevd.service etc-udev-rules.d.mount +After=systemd-udev-trigger.service etc-udev-rules.d.mount +Before=hassos-bind.target +ConditionPathIsReadWrite=/sys + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/udevadm control --reload-rules +ExecStart=/usr/bin/udevadm trigger --type=subsystems --action=add +ExecStart=/usr/bin/udevadm trigger --type=devices --action=add + +[Install] +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount index e535f1ca2..df5616926 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-boot.mount @@ -6,7 +6,7 @@ After=local-fs.target Conflicts=umount.target [Mount] -What=LABEL=hassos-boot +What=/dev/disk/by-label/hassos-boot Where=/mnt/boot Type=auto diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount index 116ee32ae..fc258439b 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-config.mount @@ -2,7 +2,7 @@ Description=HassOS config partition [Mount] -What=LABEL=CONFIG +What=/dev/disk/by-label/CONFIG Where=/mnt/config Type=auto Options=ro diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount index e1633958d..fdb2d2880 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-data.mount @@ -7,7 +7,7 @@ Before=umount.target systemd-tmpfiles-setup.service Conflicts=umount.target [Mount] -What=LABEL=hassos-data +What=/dev/disk/by-label/hassos-data Where=/mnt/data Type=ext4 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount index e982a430d..787aac375 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mnt-overlay.mount @@ -5,7 +5,7 @@ Before=umount.target systemd-tmpfiles-setup.service Conflicts=umount.target [Mount] -What=LABEL=hassos-overlay +What=/dev/disk/by-label/hassos-overlay Where=/mnt/overlay Type=ext4