From 2546ef6e65c7407c8352e5900cc3564b84bdb466 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Fri, 21 Oct 2005 19:32:37 +0200
Subject: fix my bad hand merging, verified against the last debian-kernel svn
 tree

---
 hook-functions | 4 ++--
 mkinitramfs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hook-functions b/hook-functions
index 32a7e5f..189db2e 100644
--- a/hook-functions
+++ b/hook-functions
@@ -13,7 +13,7 @@ catenate_cpiogz() {
 force_load()
 {
 		manual_add_modules ${@}
-		echo ${@} >>"${DESTDIR}/conf/modules"
+		echo "${@}" >>"${DESTDIR}/conf/modules"
 }
 
 # Takes a file containing a list of modules to be added as an
@@ -40,7 +40,7 @@ add_modules_from_file()
 
 manual_add_modules()
 {
-	for mam_x in $(modprobe --set-version=${version} --show-depends ${1} 2>/dev/null | awk '{ print $2 }'); do
+	for mam_x in $(modprobe --set-version="${version}" --show-depends "${1}" 2>/dev/null | awk '{ print $2 }'); do
 		# Prune duplicates
 		if [ -e "${DESTDIR}/${mam_x}" ]; then
 			continue
diff --git a/mkinitramfs b/mkinitramfs
index 63c9b27..58d42e1 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -30,7 +30,7 @@ while true; do
 	-o)
 		touch $2
 		outfile="$(readlink -f "$2")"
-		shift $2
+		shift 2
 		;;
 	-k)
 		keep="y"
-- 
cgit v1.2.3