From a535349f59de31c591cb15455203e0f4f75a8b8f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 14 Aug 2012 19:01:41 -0500
Subject: [PATCH] quick fixes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                  | 6 +++---
 scripts/debian-tweaks.diff | 2 +-
 scripts/ubuntu-tweaks.diff | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index dcf4eb7..8b46506 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1197,9 +1197,9 @@ function populate_boot {
 		if [ "${need_dtbs}" ] ; then
 			echo "Copying Device Tree Files:"
 			if [ "x${boot_fstype}" == "xfat" ] ; then
-				sudo tar xfvo "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+				tar xfvo "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
 			else
-				sudo tar xfv "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+				tar xfv "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
 			fi
 			echo "-----------------------------"
 		fi
@@ -1213,7 +1213,7 @@ function populate_boot {
 				run loaduimage
 			__EOF__
 			mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/boot.scr
-			sudo cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr
+			cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr
 		fi
 
 		echo "Copying uEnv.txt based boot scripts to Boot Partition"
diff --git a/scripts/debian-tweaks.diff b/scripts/debian-tweaks.diff
index 2ee79c0..dc01027 100644
--- a/scripts/debian-tweaks.diff
+++ b/scripts/debian-tweaks.diff
@@ -23,7 +23,7 @@ index 0000000..6d06fc7
 +	fi
 +
 +	if [ -d /lib/firmware/ ] ; then
-+		cp -r /lib/firmware/ /target/lib/ || true
++		cp -ru /lib/firmware/ /target/lib/ || true
 +	fi
 +
 +	rm -f /etc/rcn.conf
diff --git a/scripts/ubuntu-tweaks.diff b/scripts/ubuntu-tweaks.diff
index 650290b..57540a3 100644
--- a/scripts/ubuntu-tweaks.diff
+++ b/scripts/ubuntu-tweaks.diff
@@ -20,7 +20,7 @@ index 0000000..6d06fc7
 +	echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf
 +
 +	if [ -d /lib/firmware/ ] ; then
-+		cp -r /lib/firmware/ /target/lib/ || true
++		cp -ru /lib/firmware/ /target/lib/ || true
 +	fi
 +
 +	rm -f /etc/rcn.conf