From 2278cbe8e3c3aec7b58201105b326bae260cc654 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 26 Feb 2019 14:05:41 +0100
Subject: [hardware-stats/rootfs-stage32] Ignore USB sticks/HDDs

---
 .../hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats      | 2 +-
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
index f2076bb3..76adb3d4 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
@@ -180,7 +180,7 @@ echo "Temp partition: $ID44 MB"
 FDISK=$(mktemp)
 declare -a DISKS
 shopt -s extglob
-for disk in /dev/disk/by-path/!(*-part*); do
+for disk in /dev/disk/by-path/!(*-part*|*-usb-*); do
 	[ -L "$disk" ] || continue
 	disk="$( readlink -f "$disk" )"
 	DISKS+=("$disk")
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 95709bbf..6a9ebfd4 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
@@ -162,7 +162,7 @@ if ! has_hdd; then
 fi
 
 shopt -s extglob
-for disk in /dev/disk/by-path/!(*-part*); do
+for disk in /dev/disk/by-path/!(*-part*|*-usb-*); do
 	[ -L "$disk" ] || continue
 	fdisk -l "$( readlink -f "$disk" )"
 done > "$PARTITION_FILE"
-- 
cgit v1.2.3-55-g7522