From 4790dce6a1003ed797c5d998a8df4cef6051d9ba Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 14 Dec 2008 05:25:55 +0100
Subject: [PATCH] initramfs-tools: fix perms in do_install().

--HG--
extra : convert_revision : 0099649bda22d00e7455abe9ec4b3899381d6fa3
---
 templates/initramfs-tools.tmpl | 54 +++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/templates/initramfs-tools.tmpl b/templates/initramfs-tools.tmpl
index 645219f3f4a..bbc4c6e1f87 100644
--- a/templates/initramfs-tools.tmpl
+++ b/templates/initramfs-tools.tmpl
@@ -17,7 +17,7 @@ long_desc="
  LVM2, LUKS or NFS is also supported. Any boot loader with initrd support is
  able to load an initramfs archive."
 
-build_depends="cpio-2.9 util-linux-2.12r klibc-1.5.14 module-init-tools-3.5 udev-1.30"
+build_depends="cpio-2.9 util-linux-ng-2.14 klibc-1.5.14 module-init-tools-3.5 udev-1.30"
 run_depends="glibc-2.8 $build_depends"
 
 do_install()
@@ -26,23 +26,32 @@ do_install()
 	local etcdir=$destdir/etc/$pkgname
 
 	# Required dirs
-	install -d -m 755 $etcdir/hooks
-	install -d -m 755 $etcdir/conf.d
-	install -d -m 755 $etcdir/scripts/init-{bottom,premount,top}
-	install -d -m 755 $etcdir/scripts/local-{bottom,premount,top}
-	install -d -m 755 $etcdir/scripts/nfs-{bottom,premount,top}
-	install -d -m 644 $destdir/usr/share/$pkgname
-	install -d -m 755 $destdir/usr/share/$pkgname/conf.d
-	install -d -m 755 $destdir/usr/share/$pkgname/hooks
-	install -d -m 755 $destdir/usr/share/$pkgname/hooksconf.d
-	install -d -m 755 $destdir/usr/share/$pkgname/modules.d
-	install -d -m 755 $destdir/usr/share/$pkgname/scripts
-	install -d -m 755 $destdir/usr/share/$pkgname/scripts/init-{premount,top}
-	install -d -m 755 $destdir/usr/share/$pkgname/scripts/local-{premount,top}
-	install -d -m 644 $destdir/usr/share/doc/$pkgname
-	install -d -m 644 $destdir/usr/share/doc/$pkgname/examples
-	install -d -m 644 $destdir/usr/share/man/man{5,8}
-	install -d -m 755 $destdir/usr/sbin
+	install -d $etcdir/hooks
+	install -d $etcdir/conf.d
+	install -d $etcdir/scripts/init-bottom
+	install -d $etcdir/scripts/init-premount
+	install -d $etcdir/scripts/init-top
+	install -d $etcdir/scripts/local-bottom
+	install -d $etcdir/scripts/local-premount
+	install -d $etcdir/scripts/local-top
+	install -d $etcdir/scripts/nfs-bottom
+	install -d $etcdir/scripts/nfs-premount
+	install -d $etcdir/scripts/nfs-top
+	install -d $destdir/usr/share/$pkgname
+	install -d $destdir/usr/share/$pkgname/conf.d
+	install -d $destdir/usr/share/$pkgname/hooks
+	install -d $destdir/usr/share/$pkgname/hooksconf.d
+	install -d $destdir/usr/share/$pkgname/modules.d
+	install -d $destdir/usr/share/$pkgname/scripts
+	install -d $destdir/usr/share/$pkgname/scripts/init-premount
+	install -d $destdir/usr/share/$pkgname/scripts/init-top
+	install -d $destdir/usr/share/$pkgname/scripts/local-premount
+	install -d $destdir/usr/share/$pkgname/scripts/local-top
+	install -d $destdir/usr/share/doc/$pkgname
+	install -d $destdir/usr/share/doc/$pkgname/examples
+	install -d $destdir/usr/share/man/man5
+	install -d $destdir/usr/share/man/man8
+	install -d $destdir/usr/sbin
 
 	# /etc config files
 	install -m 644 $wrksrc/conf/initramfs.conf $etcdir
@@ -50,8 +59,10 @@ do_install()
 
 	# Data
 	install -m 755 $wrksrc/init $destdir/usr/share/$pkgname
-	install -m 644 $wrksrc/scripts/{functions,local,nfs} \
-		$destdir/usr/share/$pkgname/scripts
+	for f in functions local nfs; do
+		install -m 644 $wrksrc/scripts/$f \
+			$destdir/usr/share/$pkgname/scripts
+	done
 	install -m 755 $wrksrc/scripts/init-premount/* \
 		$destdir/usr/share/$pkgname/scripts/init-premount
 	install -m 755 $wrksrc/scripts/init-top/* \
@@ -72,6 +83,7 @@ do_install()
 	install -m 644 $wrksrc/*.8 $destdir/usr/share/man/man8
 
 	# Scripts
-	install -m 755 $wrksrc/mkinitramfs{,-kpkg} $destdir/usr/sbin
+	install -m 755 $wrksrc/mkinitramfs $destdir/usr/sbin
+	install -m 755 $wrksrc/mkinitramfs-kpkg $destdir/usr/sbin
 	install -m 755 $wrksrc/update-initramfs $destdir/usr/sbin
 }