From ef91cda6972d2866f427cc5d4f04a03ba5c0a77a Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 29 Sep 2017 16:38:04 -0700 Subject: [PATCH 1/6] try restarting with unit file after network-online.target --- roles/2-common/tasks/udev.yml | 6 ++++++ roles/2-common/templates/udev-reboot.service | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 roles/2-common/templates/udev-reboot.service diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index f377973fd..91dea1658 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -27,3 +27,9 @@ shell: systemctl restart systemd-udevd.service when: udev_unit.stat.exists is defined and udev_unit.stat.exists +- name: reboot systemd-udevd so it has rootfs open read-write + template: src=udev-reboot.service dest=/etc/systemd/system + +- name: enable the reboot service + shell: systemctl enable udev-reboot.service + diff --git a/roles/2-common/templates/udev-reboot.service b/roles/2-common/templates/udev-reboot.service new file mode 100644 index 000000000..f1a7f6297 --- /dev/null +++ b/roles/2-common/templates/udev-reboot.service @@ -0,0 +1,9 @@ +[Unit] +Description=Make sure udev is operating on RW disk +After=network-online.target + +[Service] +ExecStart=/bin/systemctl restart systemd-udevd.service + +[Install] +WantedBy=multi-user.target From 4ba8a4825c8191b172392929a9ae652f0183f7e8 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 29 Sep 2017 16:44:12 -0700 Subject: [PATCH 2/6] make dest a directory for sure --- roles/2-common/tasks/udev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index 91dea1658..c79154536 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -28,7 +28,7 @@ when: udev_unit.stat.exists is defined and udev_unit.stat.exists - name: reboot systemd-udevd so it has rootfs open read-write - template: src=udev-reboot.service dest=/etc/systemd/system + template: src=udev-reboot.service dest=/etc/systemd/system/ - name: enable the reboot service shell: systemctl enable udev-reboot.service From 597ace9416ab3bbcf193bb129b9738eca7826a22 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 30 Sep 2017 12:42:01 -0400 Subject: [PATCH 3/6] describe as "reboot" instead of "reload" @georgejhunt please let us know if this renaming is ok (as discussed in http://minutes.iiab.io live chat) I'll do the 2nd file now. --- roles/2-common/tasks/udev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index c79154536..7e55c9f83 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -27,9 +27,9 @@ shell: systemctl restart systemd-udevd.service when: udev_unit.stat.exists is defined and udev_unit.stat.exists -- name: reboot systemd-udevd so it has rootfs open read-write - template: src=udev-reboot.service dest=/etc/systemd/system/ +- name: reload systemd-udevd so it has rootfs open read-write + template: src=udev-reload.service dest=/etc/systemd/system/ -- name: enable the reboot service - shell: systemctl enable udev-reboot.service +- name: enable the reload service + shell: systemctl enable udev-reload.service From 6ef6d28df23148881803f21b2bba99834749563d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 30 Sep 2017 12:44:04 -0400 Subject: [PATCH 4/6] describe as "reload" instead of "reboot" Per discussion in http://minutes.iiab.io live chat. @georgejhunt let us know if this is OK. --- .../templates/{udev-reboot.service => udev-reload.service} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/2-common/templates/{udev-reboot.service => udev-reload.service} (100%) diff --git a/roles/2-common/templates/udev-reboot.service b/roles/2-common/templates/udev-reload.service similarity index 100% rename from roles/2-common/templates/udev-reboot.service rename to roles/2-common/templates/udev-reload.service From 6a4c65c7bcec21a6b3381e3600f37fd1b0f88594 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 30 Sep 2017 10:09:24 -0700 Subject: [PATCH 5/6] try to create symbolic links at boot time --- roles/2-common/templates/udev-reload.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/2-common/templates/udev-reload.service b/roles/2-common/templates/udev-reload.service index f1a7f6297..96e19da7c 100644 --- a/roles/2-common/templates/udev-reload.service +++ b/roles/2-common/templates/udev-reload.service @@ -3,7 +3,8 @@ Description=Make sure udev is operating on RW disk After=network-online.target [Service] -ExecStart=/bin/systemctl restart systemd-udevd.service +ExecStartPre=/bin/systemctl restart systemd-udevd.service +ExecStart=/etc/usbmount/mount.d/70-usb-library [Install] WantedBy=multi-user.target From 6f4bfdcf34201d9167912fe9c839097468e37bef Mon Sep 17 00:00:00 2001 From: George Hunt Date: Sat, 30 Sep 2017 12:05:23 -0700 Subject: [PATCH 6/6] Revert "try to create symbolic links at boot time" This reverts commit 6a4c65c7bcec21a6b3381e3600f37fd1b0f88594. usbmount routine needs adapter variable passed in -- this does not work --- roles/2-common/templates/udev-reload.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/2-common/templates/udev-reload.service b/roles/2-common/templates/udev-reload.service index 96e19da7c..f1a7f6297 100644 --- a/roles/2-common/templates/udev-reload.service +++ b/roles/2-common/templates/udev-reload.service @@ -3,8 +3,7 @@ Description=Make sure udev is operating on RW disk After=network-online.target [Service] -ExecStartPre=/bin/systemctl restart systemd-udevd.service -ExecStart=/etc/usbmount/mount.d/70-usb-library +ExecStart=/bin/systemctl restart systemd-udevd.service [Install] WantedBy=multi-user.target