[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#488321: Patch attached



...forgot the patch.
 -- Guido
>From 35a101a2cfe554631b4b80c8cdf9dc9b3817edee Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Fri, 27 Jun 2008 22:41:48 +0200
Subject: [PATCH] add support for labeled mounts

---
 .../partman-target/finish.d/fstab_hd_entries       |   10 +++++++++-
 .../partman-target/finish.d/mount_partitions       |    3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/partman/partman-target/finish.d/fstab_hd_entries b/packages/partman/partman-target/finish.d/fstab_hd_entries
index 9c1429d..4b9d260 100755
--- a/packages/partman/partman-target/finish.d/fstab_hd_entries
+++ b/packages/partman/partman-target/finish.d/fstab_hd_entries
@@ -7,7 +7,8 @@ fstab=$(
 		[ -x "$i" ] || continue
 		$i
 	done |
-	while read fs mp type options dump pass; do
+	while read fs mp type options dump pass label; do
+		[ -z "$label" ] || fs=$label
 		echo $mp $fs $type $options $dump $pass
 	done |
 	sort |
@@ -16,8 +17,11 @@ fstab=$(
 		    (/*)
 			printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$(mapdevfs $fs)" "${mp}" "$type" "$options" "$dump" "$pass"
 			;;
+		    (LABEL=*)
+			printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$fs" "${mp}" "$type" "$options" "$dump" "$pass"
+			;;
 		esac
 	done
 )
 
 echo "$fstab" >>/target/etc/fstab
diff --git a/packages/partman/partman-target/finish.d/mount_partitions b/packages/partman/partman-target/finish.d/mount_partitions
index 9c8499e..58b8cb2 100755
--- a/packages/partman/partman-target/finish.d/mount_partitions
+++ b/packages/partman/partman-target/finish.d/mount_partitions
@@ -7,7 +7,8 @@ fstab=$(
 		[ -x "$i" ] || continue
 		$i
 	done |
-	while read fs mp type options dump pass; do
+	while read fs mp type options dump pass label; do
+		# dont try labeled mounts since busybox cant handle this
 		echo $mp $fs $type $options $dump $pass
 	done |
 	sort |
-- 
1.5.6


Reply to: