Migrate from LABEL= to /dev/disk/by-label/* (#318)

This commit is contained in:
Bryan Berg 2019-01-28 00:58:40 -08:00 committed by Pascal Vizeli
parent 73a875c263
commit 43828c2555
8 changed files with 25 additions and 5 deletions

View File

@ -0,0 +1 @@
/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service

View File

@ -2,7 +2,7 @@
Description=Udev persistent rules.d Description=Udev persistent rules.d
Requires=mnt-overlay.mount Requires=mnt-overlay.mount
After=mnt-overlay.mount After=mnt-overlay.mount
Before=systemd-udevd.service hassos-config.service Before=hassos-config.service
[Mount] [Mount]
What=/mnt/overlay/etc/udev/rules.d What=/mnt/overlay/etc/udev/rules.d

View File

@ -4,6 +4,8 @@ DefaultDependencies=no
Before=mnt-data.mount Before=mnt-data.mount
RefuseManualStart=true RefuseManualStart=true
RefuseManualStop=true RefuseManualStop=true
Requires=dev-disk-by\x2dlabel-hassos\x2ddata.device
After=dev-disk-by\x2dlabel-hassos\x2ddata.device
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -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

View File

@ -6,7 +6,7 @@ After=local-fs.target
Conflicts=umount.target Conflicts=umount.target
[Mount] [Mount]
What=LABEL=hassos-boot What=/dev/disk/by-label/hassos-boot
Where=/mnt/boot Where=/mnt/boot
Type=auto Type=auto

View File

@ -2,7 +2,7 @@
Description=HassOS config partition Description=HassOS config partition
[Mount] [Mount]
What=LABEL=CONFIG What=/dev/disk/by-label/CONFIG
Where=/mnt/config Where=/mnt/config
Type=auto Type=auto
Options=ro Options=ro

View File

@ -7,7 +7,7 @@ Before=umount.target systemd-tmpfiles-setup.service
Conflicts=umount.target Conflicts=umount.target
[Mount] [Mount]
What=LABEL=hassos-data What=/dev/disk/by-label/hassos-data
Where=/mnt/data Where=/mnt/data
Type=ext4 Type=ext4

View File

@ -5,7 +5,7 @@ Before=umount.target systemd-tmpfiles-setup.service
Conflicts=umount.target Conflicts=umount.target
[Mount] [Mount]
What=LABEL=hassos-overlay What=/dev/disk/by-label/hassos-overlay
Where=/mnt/overlay Where=/mnt/overlay
Type=ext4 Type=ext4