diff options
| -rw-r--r-- | core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service | 4 | ||||
| -rwxr-xr-x | core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service index 2cfad221..e6095302 100644 --- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service +++ b/core/rootfs/rootfs-stage32/data/etc/systemd/system/setup-partitions.service @@ -2,8 +2,8 @@ Description=Setup local disk partitions (tmp, swap) DefaultDependencies=no Before=basic.target tmp.target -After=systemd-udev-settle.service -Wants=tmp.target +After=systemd-udev-settle.service systemd-udevd.service +Wants=tmp.target systemd-udevd.service [Service] Type=oneshot diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions index 4af0d62e..293b04ea 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions @@ -118,6 +118,10 @@ mount_temp_fallback () { return 0 } +udevadm trigger +sleep 0.2 +udevadm settle +sleep 0.2 /opt/openslx/sbin/fdisk -l | grep '^/dev/' > "$PARTITION_FILE" if [ ! -s "$PARTITION_FILE" ]; then @@ -153,7 +157,7 @@ get_all_with_id () { fi done exp=${exp:1} - echo "Partition find for '$*' is '$exp'" >&2 + #echo "Partition find is '$exp'" >&2 for dev in $(find /dev/ -type b); do udevadm info --name="$dev" | grep -iqE "($exp)\$" && echo "$(blockdev --getsize64 "$dev") $dev" done | sort -n -k1 -r | cut -d' ' -f2 |