X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=5306cf5ba6292bf6f4a8555842b10402942ab089;hb=65dc1e4b2ba0d3e086308d4ad3104a1ce3a098cd;hp=ce2874236f1f5a8dbed7b4622eb1799fa3c02347;hpb=395a2b5f13edc3c3d39a414c403ed317711e9d1b;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index ce28742..5306cf5 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -530,6 +530,24 @@ what_is_mounted_on ()
 	grep -m1 "^[^ ]\+ ${dir} " /proc/mounts | cut -d' ' -f1
 }
 
+chown_ref ()
+{
+	local reference="${1}"
+	shift
+	local targets=${@}
+	local owner=$(stat -c %u:%g "${reference}")
+	chown -h ${owner} ${targets}
+}
+
+chmod_ref ()
+{
+	local reference="${1}"
+	shift
+	local targets=${@}
+	local rights=$(stat -c %a "${reference}")
+	chmod ${rights} ${targets}
+}
+
 lastline ()
 {
 	while read lines
@@ -1164,17 +1182,19 @@ link_files ()
 			then
 				mkdir -p "${dest}"
 				prev="$(dirname "${dest}")"
-				chown --reference "${prev}" "${dest}"
-				chmod --reference "${prev}" "${dest}"
+				chown_ref "${prev}" "${dest}"
+				chmod_ref "${prev}" "${dest}"
 			fi
 			link_files "${src}" "${dest}" "${src_mask}"
 		else
+			local final_src=${src}
 			if [ -n "${src_mask}" ]
 			then
-				src="$(echo ${src} | sed "s|^${src_mask}||")"
+				final_src="$(echo ${final_src} | sed "s|^${src_mask}||")"
 			fi
 			rm -rf "${dest}" 2> /dev/null
-			ln -s "${src}" "${dest}"
+			ln -s "${final_src}" "${dest}"
+			chown_ref "${src}" "${dest}"
 		fi
 	done
 }
@@ -1433,8 +1453,8 @@ activate_custom_mounts ()
 				# unions and don't need to be bootstrapped
 				# linkfiles dirs can't be bootstrapped in a sensible way
 				mkdir -p "${source}"
-				chown --reference "${dest}" "${source}"
-				chmod --reference "${dest}" "${source}"
+				chown_ref "${dest}" "${source}"
+				chmod_ref "${dest}" "${source}"
 			else
 				# ensure that $dest is not copied *into* $source
 				mkdir -p "$(dirname ${source})"
@@ -1494,8 +1514,8 @@ activate_custom_mounts ()
 				rm -rf "${cow_dir}"
 			fi
 			mkdir -p ${cow_dir}
-			chown --reference "${source}" "${cow_dir}"
-			chmod --reference "${source}" "${cow_dir}"
+			chown_ref "${source}" "${cow_dir}"
+			chmod_ref "${source}" "${cow_dir}"
 			do_union ${dest} ${cow_dir} ${source} ${rofs_dest_backing}
 		fi