add more firmware to slax, do not use device labels in media, chown guest dir

2017-12-15 10:48:05 -05:00
parent 443a0fcdd2
commit f0fc8f5255
4 changed files with 8 additions and 5 deletions
@@ -800,10 +800,9 @@ fstab_create()

   echo >> $FSTAB

-   blkid | cut -d: -f 1 | while read DEVICE; do
+   blkid | grep -v "^/dev/loop" | cut -d: -f 1 | while read DEVICE; do
      FS="$(device_tag $DEVICE TYPE)"
-      LABEL="$(device_tag $DEVICE LABEL | sed -r "s:[/ ]:_:g")"
-      if [ "$LABEL" = "" ]; then LABEL="$(basename $DEVICE)"; fi
+      LABEL="$(basename $DEVICE)"
      if [ "$FS" != "swap" -a "$FS" != "squashfs" ]; then
         mkdir -p "$1/media/$LABEL"
         echo "$DEVICE" "/media/$LABEL" $FS defaults,noatime 0 0 >> $FSTAB