- mv /etc/mkinitramfs /etc/initramfs-tools

  upgrade handling on preinst
- update TODO
- update bug script

9 files changed, 93 insertions, 32 deletions

diff --git a/debian/TODO b/debian/TODO
index 1f187ae..2c2edc0 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -3,12 +3,12 @@ TODO
 
  o Grep for TODO and FIXME and do those. =)
 
- o Eliminate ?udev?, klibc.
+ o Eliminate ?udev?, ?klibc?, busybox (-> glibc).
 
  o Support list and dep options
 
  o Default to dep for PPC - Possibly to detect newworld?
 
- o External hooks support for evms
+ o lilo timeouts handling
 
- o Support cryptoroot
+ o mdadm + lvm2 hooks to their respective packages
diff --git a/debian/bug b/debian/bug
index fda2017..b1b477d 100755
--- a/debian/bug
+++ b/debian/bug
@@ -1,3 +1,15 @@
-cat /proc/cmdline >&3
-grep -v nodev /proc/filesystems >&3
-lsmod >&3
+#!/bin/sh
+
+exec >&3
+
+echo "-- /proc/cmdline"
+cat /proc/cmdline
+echo
+
+echo "-- /proc/filesystems"
+grep -v nodev /proc/filesystems
+echo
+
+echo "-- lsmod"
+lsmod
+echo
diff --git a/debian/changelog b/debian/changelog
index 4c773aa..4a02bdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+initramfs-tools (0.61) unstable; urgency=low
+
+  Release "O partigiano portami via"
+
+  * debian/TODO: update to latest state.
+
+  * debian/bug: Fix reportbug script shebang line, add some descriptive echos.
+
+  * debian/control: Pump to 3.7.2 standard version without changes.
+
+  * init: Use 10M as tmpfs_size for the udev /dev. (closes: #352434)
+
+  * /etc/initramfs-tools: Use the much more intituive conf dir location.
+    Thanks for the idea to Andres Salomon <dilinger@debian.org>.
+
+  * debian/initramfs-tools.preinst: mv /etc/mkinitramfs /etc/initramfs-tools
+    on upgrade as this should work even with drive space issues.
+    Thanks to Jeff Bailey <jbailey@raspberryginger.com> for the posix atomic
+    mv hint and Daniel Blaschke <blaschke@hep.itp.tuwien.ac.at> for testing.
+
+  * mkinitramfs: Set CONFDIR to /etc/initramfs-tools.
+
+  * mkinitramfs.8, initramfs-tools.8: Document the new pathes.
+
+  * debian/control: Change Build-depends-indep to Build-depends as we need
+    debhelper and cdbs for the clean target, fulfills policy 7.6.
+
+  * debian/initramfs-tools.preinst: Warn and bail out if /etc/initramfs-tools
+    already exists.
+
+ -- maximilian attems <maks@sternwelten.at>  Thu, 18 May 2006 17:27:44 +0200
+
 initramfs-tools (0.60) unstable; urgency=low
 
   "E ho trovato l'invasor"
diff --git a/debian/control b/debian/control
index 01ddf3b..bf022d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
 Priority: optional
 Uploaders: Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@sternwelten.at>
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs
-Standards-Version: 3.6.2.0
+Build-Depends: debhelper (>= 4.1.0), cdbs
+Standards-Version: 3.7.2.0
 
 Package: initramfs-tools
 Architecture: all
diff --git a/debian/initramfs-tools.dirs b/debian/initramfs-tools.dirs
index 9325057..0a807a5 100644
--- a/debian/initramfs-tools.dirs
+++ b/debian/initramfs-tools.dirs
@@ -1,13 +1,13 @@
-etc/mkinitramfs/scripts/init-bottom
-etc/mkinitramfs/scripts/init-premount
-etc/mkinitramfs/scripts/init-top
-etc/mkinitramfs/scripts/local-bottom
-etc/mkinitramfs/scripts/local-premount
-etc/mkinitramfs/scripts/local-top
-etc/mkinitramfs/scripts/nfs-bottom
-etc/mkinitramfs/scripts/nfs-premount
-etc/mkinitramfs/scripts/nfs-top
-etc/mkinitramfs/hooks
-etc/mkinitramfs/conf.d
+etc/initramfs-tools/scripts/init-bottom
+etc/initramfs-tools/scripts/init-premount
+etc/initramfs-tools/scripts/init-top
+etc/initramfs-tools/scripts/local-bottom
+etc/initramfs-tools/scripts/local-premount
+etc/initramfs-tools/scripts/local-top
+etc/initramfs-tools/scripts/nfs-bottom
+etc/initramfs-tools/scripts/nfs-premount
+etc/initramfs-tools/scripts/nfs-top
+etc/initramfs-tools/hooks
+etc/initramfs-tools/conf.d
 usr/share/initramfs-tools/modules.d
 /var/lib/initramfs-tools
diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install
index 9a4f31e..a5b87df 100644
--- a/debian/initramfs-tools.install
+++ b/debian/initramfs-tools.install
@@ -2,7 +2,7 @@ mkinitramfs		usr/sbin
 mkinitramfs-kpkg	usr/sbin
 init			usr/share/initramfs-tools
 scripts			usr/share/initramfs-tools
-conf/initramfs.conf	etc/mkinitramfs
+conf/initramfs.conf	etc/initramfs-tools
 hooks			usr/share/initramfs-tools
 hook-functions		usr/share/initramfs-tools
 update-initramfs	usr/sbin
diff --git a/debian/initramfs-tools.postinst b/debian/initramfs-tools.postinst
index 63ceef8..94c5c1b 100644
--- a/debian/initramfs-tools.postinst
+++ b/debian/initramfs-tools.postinst
@@ -14,29 +14,29 @@ if [ "$1" = configure ]; then
 		fi
 
 		if [ -e /etc/mkinitrd/modules ]; then
-			cp /etc/mkinitrd/modules /etc/mkinitramfs
+			cp /etc/mkinitrd/modules /etc/initramfs-tools
 			sed -i \
 			  -e 's/mkinitrd/mkinitramfs/g' \
 			  -e '/^ide-generic/d' \
 			  -e '/^ide-disk/d' \
 			  -e '/^ext2/d' \
 			  -e '/^ext3/d' \
-			  /etc/mkinitramfs/modules
+			  /etc/initramfs-tools/modules
 		fi
 
 		if [ -e ${RESUME} ]; then
-			echo "RESUME=${RESUME}" > /etc/mkinitramfs/conf.d/resume
+			echo "RESUME=${RESUME}" > /etc/initramfs-tools/conf.d/resume
 		fi
 
 		if [ -e /etc/mkinitrd/DSDT ]; then
-			cp /etc/mkinitrd/DSDT /etc/mkinitramfs/DSDT.aml
+			cp /etc/mkinitrd/DSDT /etc/initramfs-tools/DSDT.aml
 		fi
 
 	fi
 fi
 
-if [ ! -e /etc/mkinitramfs/modules ]; then
-	cp /usr/share/doc/initramfs-tools/examples/modules /etc/mkinitramfs/
+if [ ! -e /etc/initramfs-tools/modules ]; then
+	cp /usr/share/doc/initramfs-tools/examples/modules /etc/initramfs-tools/
 fi
 
 # Regenerate initramfs on upgrade
diff --git a/debian/initramfs-tools.postrm b/debian/initramfs-tools.postrm
index 0c2d39a..b711f2c 100644
--- a/debian/initramfs-tools.postrm
+++ b/debian/initramfs-tools.postrm
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ "x${1}" = "xpurge" ]; then
-	rm -f /etc/mkinitramfs/modules
-	rm -f /etc/mkinitramfs/conf.d/resume
+	rm -f /etc/initramfs-tools/modules
+	rm -f /etc/initramfs-tools/conf.d/resume
 fi
 
 #DEBHELPER#
diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst
index 3582290..3ec83c6 100644
--- a/debian/initramfs-tools.preinst
+++ b/debian/initramfs-tools.preinst
@@ -2,13 +2,30 @@
 
 set -e
 
-[ -f /etc/mkinitramfs/initramfs.conf ] && . /etc/mkinitramfs/initramfs.conf
+case "$1" in
+	upgrade)
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.61"; then
+		if [ -d /etc/initramfs-tools ]; then
+			echo
+			echo "Warning: /etc/initramfs-tools already exists."
+			echo "         Please remove it for upgrade."
+			echo
+			exit 1
+		fi
+		if [ -d /etc/mkinitramfs ]; then
+			mv /etc/mkinitramfs /etc/initramfs-tools
+		fi
+	fi
+	;;
+esac
+
+[ -f /etc/initramfs-tools/initramfs.conf ] && . /etc/initramfs-tools/initramfs.conf
 if [ -z ${RESUME} ]; then
        exit 0
 else
-       mkdir -p /etc/mkinitramfs/conf.d
-       echo "RESUME=${RESUME}" > /etc/mkinitramfs/conf.d/resume
-       sed -i -e "s/RESUME=.*/#RESUME=/" /etc/mkinitramfs/initramfs.conf
+       mkdir -p /etc/initramfs-tools/conf.d
+       echo "RESUME=${RESUME}" > /etc/initramfs-tools/conf.d/resume
+       sed -i -e "s/RESUME=.*/#RESUME=/" /etc/initramfs-tools/initramfs.conf
 fi
 
 #DEBHELPER#