r3013 - in trunk/utils/initrd-tools: . debian

[maximilian attems]

Author: maks-guest
Date: 2005-04-28 21:05:51 +0000 (Thu, 28 Apr 2005)
New Revision: 3013

Modified:
   trunk/utils/initrd-tools/TODO
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/debian/rules
Log:
apply patch from horms to fix permisission handling.


Modified: trunk/utils/initrd-tools/TODO
===================================================================
--- trunk/utils/initrd-tools/TODO	2005-04-28 19:32:55 UTC (rev 3012)
+++ trunk/utils/initrd-tools/TODO	2005-04-28 21:05:51 UTC (rev 3013)
@@ -3,13 +3,13 @@
 	* #279382, #292080, #295422, #297724 ldd fix for amd64
 	* #272143, #266609, #263169, #264440 root on sata not found
 	* #283919 warn if root device is not found when dev nonexistent
-	* #285767 mkinitrd install with execute permission
 	* #284141 do not rely on /proc/scsi
 	* #304483 ignores separate raid /boot partition
 	* #290708 dm-crypt devices initialized with wrong arguments
 	* #288010 PowerPC installed initrd misses files
 	* #284763, #269726, #305145, #299103 md wihtout devfs
 	* #281658 /etc/raidtab parse error
+	* #270087 BUSYBOX=yes -> no insmod so modprobe broken!
 	* #270898 xfs troubles
 	* #260333 troubles with hfsplus root
 	* #268622 mkinitrd: Fails on modprobe warnings

Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-28 19:32:55 UTC (rev 3012)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-28 21:05:51 UTC (rev 3013)
@@ -14,6 +14,8 @@
     - Fix upgrade path from woody for sparc arch. thanks to 
       Jurij Smakov <jurij@wooyd.org> Closes: #306219
     - Use libdevmapper1.01 Closes: #266591, #298727, #303401
+    - Fix permissions of the initrd files. thanks to patch for debian/rules
+      from Horms <horms@debian.org> Closes: #285767
 
  -- Steve Langasek <vorlon@debian.org>  Sun, 10 Apr 2005 15:38:08 -0700
 

Modified: trunk/utils/initrd-tools/debian/rules
===================================================================
--- trunk/utils/initrd-tools/debian/rules	2005-04-28 19:32:55 UTC (rev 3012)
+++ trunk/utils/initrd-tools/debian/rules	2005-04-28 21:05:51 UTC (rev 3013)
@@ -17,6 +17,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean
+	rm -f debian/version
 
 install: 
 	dh_testdir
@@ -25,10 +26,16 @@
 	dh_installdirs
 
 	sed 's/.* (\([^)]*\)).*/VERSION=\1/;q' debian/changelog \
-		> debian/initrd-tools/usr/share/initrd-tools/version
-	cp echo init linuxrc debian/initrd-tools/usr/share/initrd-tools
-	cp mkinitrd debian/initrd-tools/usr/sbin
-	cp mkinitrd.conf modules debian/initrd-tools/etc/mkinitrd
+		> debian/version
+	install -o root -g root -m 644 debian/version \
+		debian/initrd-tools/usr/share/initrd-tools/version
+	rm -f debian/version
+	install -o root -g root -m 644 \
+		echo init linuxrc debian/initrd-tools/usr/share/initrd-tools/
+	install -o root -g root -m 755 \
+		mkinitrd debian/initrd-tools/usr/sbin/
+	install -o root -g root -m 644 \
+		mkinitrd.conf modules debian/initrd-tools/etc/mkinitrd/
 
 # Build architecture-dependent files here.
 binary-arch: build install