From 0d19ff751ee9d9ceb2bf41de2b6fb0c0094a1aaa Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Fri, 17 Feb 2006 21:43:38 +0100
Subject: add kernel-package compat stuff, behaves like mkinitramfs and adds an
 sha1sum for update-initramfs.

is meant for etch release, hope we get rid afterwards.
will allow to clean up mkinitramfs from the longoption calls.
---
 mkinitramfs-kpkg | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 mkinitramfs-kpkg

(limited to 'mkinitramfs-kpkg')

diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
new file mode 100644
index 0000000..d36710a
--- /dev/null
+++ b/mkinitramfs-kpkg
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+STATEDIR=/var/lib/initramfs-tools
+
+usage()
+{
+	cat >&2 << EOF
+
+Usage: ${0} <-o outfile> [version]
+
+Please use update-initramfs(8):
+${0} exists for compatibility by kernel-package(5) calls.
+See ${0}(8) for further details.
+EOF
+	exit 1
+}
+
+OPTIONS=`getopt -o m:o: --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
+# Check for non-GNU getopt
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTIONS"
+
+while true; do
+	case "$1" in
+	-m)
+		# ignore
+		shift 2
+		;;
+	-o)
+		touch $2
+		outfile="$(readlink -f "$2")"
+		shift 2
+		;;
+	--supported-host-version)
+		supported_host_version="$2"
+		shift 2
+		;;
+	--supported-target-version)
+		supported_target_version="$2"
+		shift 2
+		;;
+	--)
+		shift
+		break
+		;;
+	*)
+		echo "Internal error!" >&2
+		exit 1
+		;;
+	esac
+done
+
+if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
+	if [ -n "$supported_host_version" ]; then
+		host_upstream_version="${supported_host_version%%-*}"
+	fi
+	if [ -n "$supported_target_version" ]; then
+		target_upstream_version="${supported_target_version%%-*}"
+		if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
+			exit 2
+		fi
+	fi
+	exit 0
+fi
+
+
+if [ -z "${outfile}" ]; then
+	usage
+fi
+
+# And by "version" we really mean path to kernel modules
+# This is braindead, and exists to preserve the interface with mkinitrd
+version="${1}"
+
+case "${version}" in
+/lib/modules/*/[!/]*)
+        ;;
+/lib/modules/[!/]*)
+        version="${version#/lib/modules/}"
+        version="${version%%/*}"
+        ;;
+esac
+
+case "${version}" in
+*/*)
+        echo "$PROG: ${version} is not a valid kernel version" >&2
+        exit 1
+        ;;
+esac
+
+# linux-image installs latest version 
+mkinitramfs -o ${outfile} ${version}
+sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}"
-- 
cgit v1.2.3


From 70610d50c1815295a8bbe2c580738808b34034dc Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 20 Feb 2006 13:32:23 +0100
Subject: set takeover=1 in debian too, removes the need of a stupid wrapper
 package

---
 debian/changelog                | 15 ++++---
 debian/initramfs-tools.install  |  1 -
 debian/initramfs-tools.manpages |  1 -
 mkinitramfs-kpkg                | 94 -----------------------------------------
 mkinitramfs-kpkg.8              | 49 ---------------------
 update-initramfs                |  4 +-
 6 files changed, 11 insertions(+), 153 deletions(-)
 delete mode 100644 mkinitramfs-kpkg
 delete mode 100644 mkinitramfs-kpkg.8

(limited to 'mkinitramfs-kpkg')

diff --git a/debian/changelog b/debian/changelog
index 720c344..033943e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+initramfs-tools (0.52b) unstable; urgency=high
+
+  * update-initramfs: Set takeover=1. This allows hooks to regenerate the
+    latest initramfs per default. No need for an kpkg wrapper, as
+    kernel-package doesn't call update-initramfs, but mkinitramfs.
+
+ -- maximilian attems <maks@sternwelten.at>  Mon, 20 Feb 2006 13:30:54 +0100
+
 initramfs-tools (0.52) unstable; urgency=low
 
   * hooks/lvm: manual_add_modules dm_snapshot, will allow boot from lvm
@@ -8,17 +16,12 @@ initramfs-tools (0.52) unstable; urgency=low
   * scripts/init-premount/udev-helper: Renamed from scripts/init-premount/ide.
 
   * update-initramfs: s/was/has/ been altered.
-    (closes: #351939, #352633, #353087)
+    (closes: #351939, #352633, #353087, #353668)
 
   * update-initramfs(8), mkinitramfs(8): The point of the first is to be used
     on your local box. Highlight its mode of operations. The second cmd is
     only needed for advanced usage.
 
-  * mkinitramfs-kpkg: Add an compat call for kernel-package. Has the same
-    broken syntax than mkinitrd and adds an sha1sum for update-initramfs.
-
-  * mkinitramfs-kpkg.8: Add warnings to use update-initramfs instead.
-
  -- maximilian attems <maks@sternwelten.at>  Fri, 17 Feb 2006 21:41:11 +0100
 
 initramfs-tools (0.51) unstable; urgency=low
diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install
index b722d90..3a7a503 100644
--- a/debian/initramfs-tools.install
+++ b/debian/initramfs-tools.install
@@ -1,5 +1,4 @@
 mkinitramfs		usr/sbin
-mkinitramfs-kpkg	usr/sbin
 init			usr/share/initramfs-tools
 scripts			usr/share/initramfs-tools
 conf/initramfs.conf	etc/mkinitramfs
diff --git a/debian/initramfs-tools.manpages b/debian/initramfs-tools.manpages
index f127e99..8a27566 100644
--- a/debian/initramfs-tools.manpages
+++ b/debian/initramfs-tools.manpages
@@ -1,5 +1,4 @@
 mkinitramfs.8
-mkinitramfs-kpkg.8
 initramfs.conf.5
 initramfs-tools.8
 update-initramfs.8
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
deleted file mode 100644
index d36710a..0000000
--- a/mkinitramfs-kpkg
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-STATEDIR=/var/lib/initramfs-tools
-
-usage()
-{
-	cat >&2 << EOF
-
-Usage: ${0} <-o outfile> [version]
-
-Please use update-initramfs(8):
-${0} exists for compatibility by kernel-package(5) calls.
-See ${0}(8) for further details.
-EOF
-	exit 1
-}
-
-OPTIONS=`getopt -o m:o: --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
-# Check for non-GNU getopt
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-
-eval set -- "$OPTIONS"
-
-while true; do
-	case "$1" in
-	-m)
-		# ignore
-		shift 2
-		;;
-	-o)
-		touch $2
-		outfile="$(readlink -f "$2")"
-		shift 2
-		;;
-	--supported-host-version)
-		supported_host_version="$2"
-		shift 2
-		;;
-	--supported-target-version)
-		supported_target_version="$2"
-		shift 2
-		;;
-	--)
-		shift
-		break
-		;;
-	*)
-		echo "Internal error!" >&2
-		exit 1
-		;;
-	esac
-done
-
-if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
-	if [ -n "$supported_host_version" ]; then
-		host_upstream_version="${supported_host_version%%-*}"
-	fi
-	if [ -n "$supported_target_version" ]; then
-		target_upstream_version="${supported_target_version%%-*}"
-		if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
-			exit 2
-		fi
-	fi
-	exit 0
-fi
-
-
-if [ -z "${outfile}" ]; then
-	usage
-fi
-
-# And by "version" we really mean path to kernel modules
-# This is braindead, and exists to preserve the interface with mkinitrd
-version="${1}"
-
-case "${version}" in
-/lib/modules/*/[!/]*)
-        ;;
-/lib/modules/[!/]*)
-        version="${version#/lib/modules/}"
-        version="${version%%/*}"
-        ;;
-esac
-
-case "${version}" in
-*/*)
-        echo "$PROG: ${version} is not a valid kernel version" >&2
-        exit 1
-        ;;
-esac
-
-# linux-image installs latest version 
-mkinitramfs -o ${outfile} ${version}
-sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}"
diff --git a/mkinitramfs-kpkg.8 b/mkinitramfs-kpkg.8
deleted file mode 100644
index 34f76db..0000000
--- a/mkinitramfs-kpkg.8
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH MKINITRAMFS-KPKG 8  "$Date: 2006/02/17 $" "" "mkinitramfs-kpkg manual"
-
-.SH NAME
-mkinitramfs-kpkg \- generates an initramfs image for kernel-package
-
-.SH SYNOPSIS
-.B mkinitramfs
-.RB [ \-o 
-.IR outfile ] 
-.RI [ version ]
-.B mkinitramfs
-.RB [ \-\-supported-host-version=
-.IR hversion ]
-.RB [ \-\-supported-target-version=
-.IR tversion ]
-
-.SH DESCRIPTION
-The
-.B mkinitramfs-kpkg
-script calls
-.B mkinitramfs
-for kernel-package. It's usage is not recommended.
-See
-.B update-initramfs
-for an better alternative.
-
-.SH OPTIONS
-
-.TP
-\fB \-o \fI outfile
-Write the image to 
-.IR outfile .
-
-.TP
-\fB\-\-supported-host-version=\fIhversion
-This option queries if mkinitramfs can create ramdisks on a running kernel of version
-.IR hversion .
-
-.TP
-\fB\-\-supported-target-version=\fItversion
-This option queries if mkinitramfs can create ramdisks for kernel version
-.IR tversion .
-
-.SH AUTHOR
-mkinitramfs-kpkg is maintained by Maximilian Attems <maks@sternwelten.at>.
-
-.SH SEE ALSO
-
-.BR initramfs.conf (5), initramfs-tools (8), update-initramfs (8)
diff --git a/update-initramfs b/update-initramfs
index ddb6877..9ab4607 100644
--- a/update-initramfs
+++ b/update-initramfs
@@ -238,8 +238,8 @@ altered_check()
 # Defaults
 verbose=0
 yes=0
-# We default to takeover=1 in Ubuntu, but not Debian
-takeover=0
+# We default to takeover=1 to allow hooks to update latest initramfs
+takeover=1
 
 ##
 
-- 
cgit v1.2.3


From 833ebf13b59f2cc2e9af15f2df3727f4e09bec41 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Mon, 27 Feb 2006 01:16:09 +0100
Subject: readd the kpkg compat wrapper

---
 mkinitramfs-kpkg   | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mkinitramfs-kpkg.8 | 49 ++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 mkinitramfs-kpkg
 create mode 100644 mkinitramfs-kpkg.8

(limited to 'mkinitramfs-kpkg')

diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
new file mode 100644
index 0000000..d36710a
--- /dev/null
+++ b/mkinitramfs-kpkg
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+STATEDIR=/var/lib/initramfs-tools
+
+usage()
+{
+	cat >&2 << EOF
+
+Usage: ${0} <-o outfile> [version]
+
+Please use update-initramfs(8):
+${0} exists for compatibility by kernel-package(5) calls.
+See ${0}(8) for further details.
+EOF
+	exit 1
+}
+
+OPTIONS=`getopt -o m:o: --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
+# Check for non-GNU getopt
+if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+
+eval set -- "$OPTIONS"
+
+while true; do
+	case "$1" in
+	-m)
+		# ignore
+		shift 2
+		;;
+	-o)
+		touch $2
+		outfile="$(readlink -f "$2")"
+		shift 2
+		;;
+	--supported-host-version)
+		supported_host_version="$2"
+		shift 2
+		;;
+	--supported-target-version)
+		supported_target_version="$2"
+		shift 2
+		;;
+	--)
+		shift
+		break
+		;;
+	*)
+		echo "Internal error!" >&2
+		exit 1
+		;;
+	esac
+done
+
+if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
+	if [ -n "$supported_host_version" ]; then
+		host_upstream_version="${supported_host_version%%-*}"
+	fi
+	if [ -n "$supported_target_version" ]; then
+		target_upstream_version="${supported_target_version%%-*}"
+		if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
+			exit 2
+		fi
+	fi
+	exit 0
+fi
+
+
+if [ -z "${outfile}" ]; then
+	usage
+fi
+
+# And by "version" we really mean path to kernel modules
+# This is braindead, and exists to preserve the interface with mkinitrd
+version="${1}"
+
+case "${version}" in
+/lib/modules/*/[!/]*)
+        ;;
+/lib/modules/[!/]*)
+        version="${version#/lib/modules/}"
+        version="${version%%/*}"
+        ;;
+esac
+
+case "${version}" in
+*/*)
+        echo "$PROG: ${version} is not a valid kernel version" >&2
+        exit 1
+        ;;
+esac
+
+# linux-image installs latest version 
+mkinitramfs -o ${outfile} ${version}
+sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}"
diff --git a/mkinitramfs-kpkg.8 b/mkinitramfs-kpkg.8
new file mode 100644
index 0000000..34f76db
--- /dev/null
+++ b/mkinitramfs-kpkg.8
@@ -0,0 +1,49 @@
+.TH MKINITRAMFS-KPKG 8  "$Date: 2006/02/17 $" "" "mkinitramfs-kpkg manual"
+
+.SH NAME
+mkinitramfs-kpkg \- generates an initramfs image for kernel-package
+
+.SH SYNOPSIS
+.B mkinitramfs
+.RB [ \-o 
+.IR outfile ] 
+.RI [ version ]
+.B mkinitramfs
+.RB [ \-\-supported-host-version=
+.IR hversion ]
+.RB [ \-\-supported-target-version=
+.IR tversion ]
+
+.SH DESCRIPTION
+The
+.B mkinitramfs-kpkg
+script calls
+.B mkinitramfs
+for kernel-package. It's usage is not recommended.
+See
+.B update-initramfs
+for an better alternative.
+
+.SH OPTIONS
+
+.TP
+\fB \-o \fI outfile
+Write the image to 
+.IR outfile .
+
+.TP
+\fB\-\-supported-host-version=\fIhversion
+This option queries if mkinitramfs can create ramdisks on a running kernel of version
+.IR hversion .
+
+.TP
+\fB\-\-supported-target-version=\fItversion
+This option queries if mkinitramfs can create ramdisks for kernel version
+.IR tversion .
+
+.SH AUTHOR
+mkinitramfs-kpkg is maintained by Maximilian Attems <maks@sternwelten.at>.
+
+.SH SEE ALSO
+
+.BR initramfs.conf (5), initramfs-tools (8), update-initramfs (8)
-- 
cgit v1.2.3


From 4b5cc6ce7567a7075802dd8c3e47dd7cf8e84627 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Sun, 26 Mar 2006 21:09:50 +0200
Subject: fix copyright module-init-tools dep gdth lilo minor parsing fixes

---
 debian/changelog  | 28 ++++++++++++++++++++++++++--
 debian/control    |  2 +-
 debian/copyright  | 13 ++++++++++---
 hook-functions    |  4 ++--
 mkinitramfs-kpkg  |  3 ++-
 scripts/functions |  7 ++++++-
 6 files changed, 47 insertions(+), 10 deletions(-)

(limited to 'mkinitramfs-kpkg')

diff --git a/debian/changelog b/debian/changelog
index bfbd682..a2e8cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,28 @@
-initramfs-tools (0.57) unstable; urgency=low
+initramfs-tools (0.59) unstable; urgency=low
+
+  * debian/copyright: Add years of copyright and authors.
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 26 Mar 2006 21:04:28 +0200
+
+initramfs-tools (0.58) unstable; urgency=low
+
+  * hook-functions: Be more carefull about the minor parsing. The fix of
+    #357332 works for 3 digit roots, but not for hdc6 aka root=1606.
+    Thanks Martijn Pieters <mj@zopatista.com> for report
+    (closes: #358354, #358740).
+
+  * hook-functions: Add gdth to the scsi modules.
+
+  * mkinitramfs-kpkg: Use set -eu to capture full /boot.
+    Really (closes: #350875)
+
+  * Add dependency on module-init-tools. (closes: #358632)
+
+  * Don't include full path for man page reference. (closes: #358371)
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 26 Mar 2006 16:39:37 +0200
+
+initramfs-tools (0.57b) unstable; urgency=low
 
   * mkinitramfs, update-initramfs, hook-functions:
     On verbose mode show, which modules gets added to the initramfs.
@@ -7,7 +31,7 @@ initramfs-tools (0.57) unstable; urgency=low
     to Petter Reinholdtsen <pere@hungry.com>. (closes: #357980)
 
   * initramfs-tools.8: Document that `-' is not allowed to be used in a script
-    filename - the filenames get used as shell variable.  (closes: #355235)
+    filename - the filenames get used as shell variable.  (closes: #344639)
 
   * mkinitramfs: Don't exit succesfully in a case of a full fs. Leaves the
     linux-image unconfigured. Thanks martin f krafft <madduck@debian.org>
diff --git a/debian/control b/debian/control
index b4124ab..01ddf3b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2.0
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, udev (>= 0.076-5)
+Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.076-5)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for prepackaged
diff --git a/debian/copyright b/debian/copyright
index d495248..3a3bc5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,7 @@
 This package was debianized by Jeff Bailey <jbailey@ubuntu.com> on
 Thu, 27 Jan 2005 15:23:52 -0500.
 
-Copyright:
-
-Author: Jeff Bailey <jbailey@ubuntu.com>
+The current Debian maintainer is maximilian attems <maks@sternwelten.at>
 
 The source code up to 0.31 can be found by using "bzr" at:
 http://people.ubuntu.com/~jbailey/bzrtree/initramfs-tools
@@ -14,6 +12,15 @@ http://archive.ubuntu.com/ubuntu/pool/main/i/initramfs-tools/
 The Debian tree is maintained with "bzr" at:
 http://debian.stro.at/bzr-test/initramfs-tools/
 
+Authors: Jeff Bailey <jbailey@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>,
+	 Scott James Remnant <scott@ubuntu.com>, 
+	 maximilian attems <maks@sternwelten.at>
+
+Copyright: 2005 Jeff Bailey
+	   2005 - 2006 Adam Conrad
+	   2005 - 2006 Scott James Remnant
+	   2005 - 2006 maximilian attems
+
 License:
 
 PUBLIC DOMAIN
diff --git a/hook-functions b/hook-functions
index efce32d..874d55f 100644
--- a/hook-functions
+++ b/hook-functions
@@ -170,7 +170,7 @@ auto_add_modules()
 		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
 		aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic \
 		cciss ch cpqarray dac960 dc395x dmx3191d dpt_i2o eata fdomain \
-		ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
+		gdth ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
 		megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih \
 		mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 \
 		qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \
@@ -220,7 +220,7 @@ Options:
   -o outfile  Write to outfile.
   -r root     Override ROOT setting in mkinitrd.conf.
 
-See ${0}(8) for further details.
+See mkinitramfs(8) for further details.
 EOF
 	exit 1
 
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index d36710a..8d32005 100644
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -eu
 
 STATEDIR=/var/lib/initramfs-tools
 
@@ -10,7 +11,7 @@ Usage: ${0} <-o outfile> [version]
 
 Please use update-initramfs(8):
 ${0} exists for compatibility by kernel-package(5) calls.
-See ${0}(8) for further details.
+See mkinitramfs-kpkg(8) for further details.
 EOF
 	exit 1
 }
diff --git a/scripts/functions b/scripts/functions
index 05b7779..8cf6ddc 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -189,6 +189,7 @@ load_modules()
 	fi
 }
 
+# lilo compatibility
 parse_numeric() {
 	case $1 in
 	"")
@@ -201,10 +202,14 @@ parse_numeric() {
 		minor=${1#*:}
 		major=${1%:*}
 		;;
-	*)
+	[0-9][0-9][0-9])
 		minor=$((0x${1#?}))
 		major=$((0x${1%??}))
 		;;
+	*)
+		minor=$((0x${1#??}))
+		major=$((0x${1%??}))
+		;;
 	esac
 
 	mknod /dev/root b ${major} ${minor}
-- 
cgit v1.2.3


From 7f7832004e1fe8b9a13afb2ac765f4f611ffc6ed Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Tue, 28 Mar 2006 18:36:16 +0200
Subject: fix not initialized variables

---
 debian/changelog | 7 +++++++
 mkinitramfs-kpkg | 3 +++
 2 files changed, 10 insertions(+)
 mode change 100644 => 100755 mkinitramfs-kpkg

(limited to 'mkinitramfs-kpkg')

diff --git a/debian/changelog b/debian/changelog
index 93b55c4..757a015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+initramfs-tools (0.59b) unstable; urgency=low
+
+  * mkinitramfs-kpkg: Intialialize the variables. 
+    (closes: #359355, #359620, #359613, #359666, #359681)
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 28 Mar 2006 16:30:59 +0200
+
 initramfs-tools (0.59) unstable; urgency=low
 
   * debian/copyright: Add years of copyright and authors.
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
old mode 100644
new mode 100755
index 8d32005..437b0ac
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -2,6 +2,9 @@
 set -eu
 
 STATEDIR=/var/lib/initramfs-tools
+supported_host_version=""
+supported_target_version=""
+outfile=""
 
 usage()
 {
-- 
cgit v1.2.3


From 17d01b3434dac54ace5991029ed069b3d185ffd2 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Sun, 16 Jul 2006 21:54:14 +0200
Subject: massif whitespace cleanup

---
 break.txt                     |  2 +-
 debian/NEWS                   |  2 +-
 debian/changelog              | 48 +++++++++++++++++++++++++------------------
 debian/copyright              |  2 +-
 docs/example_hook             |  6 +++---
 docs/example_hook_cpiogz      |  2 +-
 docs/example_script           |  4 ++--
 hooks/lvm                     |  2 +-
 hooks/md                      |  2 +-
 init                          |  2 +-
 initramfs-tools.8             | 18 ++++++++--------
 initramfs.conf.5              |  4 ++--
 mkinitramfs                   | 20 +++++++++---------
 mkinitramfs-kpkg              | 16 +++++++--------
 mkinitramfs-kpkg.8            |  6 +++---
 mkinitramfs.8                 | 30 +++++++++++++--------------
 scripts/functions             | 12 +++++------
 scripts/local-top/udev_helper |  2 +-
 update-initramfs              |  6 +++---
 update-initramfs.8            | 26 +++++++++++------------
 20 files changed, 110 insertions(+), 102 deletions(-)

(limited to 'mkinitramfs-kpkg')

diff --git a/break.txt b/break.txt
index ff26d5b..64ecf84 100644
--- a/break.txt
+++ b/break.txt
@@ -1,4 +1,4 @@
-if [ x${break} = xyes ]; then 
+if [ x${break} = xyes ]; then
 	panic "Spawning shell within the initramfs"
 fi
 
diff --git a/debian/NEWS b/debian/NEWS
index d4647d4..a6ae4bc 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -15,7 +15,7 @@ initramfs-tools (0.10) breezy; urgency=low
     This means two things in particular that are important:
 
     1) the resulting initramfs will be huge.  Like 10 megs huge.
-       I will shrink it down once it's correct.  If you're on an 
+       I will shrink it down once it's correct.  If you're on an
        arch that doesn't like >4mb initramfs', then this won't boot.
 
     2) Your network drivers are loaded in the initramfs, so hotplug
diff --git a/debian/changelog b/debian/changelog
index 8a519b4..b48be87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,12 +8,20 @@ initramfs-tools (0.70) unstable; urgency=low
       cleanup and add quoting.
     - scripts/local: Whitespace cleanup and add a comment.
     - update-initramfs: Add quoting + whitespace fix.
-    - changelog: for noise reduction add 0.69ubuntu{1,2,3}, all 0.40ubuntu*, 
+    - changelog: for noise reduction add 0.69ubuntu{1,2,3}, all 0.40ubuntu*,
       0.36ubuntu1 and missing 0.29 + 0.28 entries.
     - initramfs-tools.install, initramfs-tools.postinst and
       initramfs-tools.preinst merge 0.69ubuntu3.
 
- -- maximilian attems <maks@sternwelten.at>  Sun, 16 Jul 2006 20:23:41 +0200
+  * break.txt, debian/NEWS, debian/changelog, debian/copyright,
+    docs/example_hook, docs/example_hook_cpiogz, docs/example_script,
+    hooks/lvm, hooks/md, init, initramfs-tools.8, initramfs.conf.5,
+    mkinitramfs, mkinitramfs-kpkg, mkinitramfs-kpkg.8, mkinitramfs.8,
+    scripts/functions, scripts/local-top/udev_helper, update-initramfs,
+    update-initramfs.8: Whitespace policy cleanup trailing whitespace and
+    non tabular indents.
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 16 Jul 2006 21:50:34 +0200
 
 initramfs-tools (0.69b) unstable; urgency=high
 
@@ -68,7 +76,7 @@ initramfs-tools (0.69) unstable; urgency=low
 
   * update-initramfs: Add option "-b directory" to override BOOTDIR.
     Allows the initramfs to be created in another dir without awkward
-    mkinitramfs invocation. Check that the passed arg is really a dir. 
+    mkinitramfs invocation. Check that the passed arg is really a dir.
     (ubuntu: 37690) Thanks Colin Watson <cjwatson@debian.org>
 
   * update-initramfs.8: Document -b switch.
@@ -312,7 +320,7 @@ initramfs-tools (0.60) unstable; urgency=low
 
 initramfs-tools (0.59b) unstable; urgency=low
 
-  * mkinitramfs-kpkg: Intialialize the variables. 
+  * mkinitramfs-kpkg: Intialialize the variables.
     (closes: #359355, #359620, #359613, #359666, #359681)
 
  -- maximilian attems <maks@sternwelten.at>  Tue, 28 Mar 2006 16:30:59 +0200
@@ -329,7 +337,7 @@ initramfs-tools (0.59) unstable; urgency=low
     - scripts/local-top/udev_helper: Leave the remaining ide-generic part
       there, should be taken over by udev itself.
     - make the md local-top scripts pre-requisite the udev one.
-      thanks Scott James Remnant <scott@ubuntu.com> 
+      thanks Scott James Remnant <scott@ubuntu.com>
 
  -- maximilian attems <maks@sternwelten.at>  Sun, 26 Mar 2006 22:35:15 +0200
 
@@ -768,7 +776,7 @@ initramfs-tools (0.40ubuntu17) dapper; urgency=low
 
   * Make auto_add_modules take an argument, so you can use it to add only
     some of the auto* modules (like "net" or "ide"), and create a "netboot"
-    option that only includes base and net (Closes launchpad.net/26426) 
+    option that only includes base and net (Closes launchpad.net/26426)
   * Change the nfs script to use "mount -o nolock" instead of "nfsmount",
     to fix some timeouts for ltsp NFS roots (Closes launchpad.net/19196)
 
@@ -854,7 +862,7 @@ initramfs-tools (0.40ubuntu8) dapper; urgency=low
 initramfs-tools (0.40ubuntu7) dapper; urgency=low
 
   * remove "sleep 3" from the nfs script before the nfsmount command,
-    its a leftover from debugging in breezy and slows down thin client 
+    its a leftover from debugging in breezy and slows down thin client
     booting unnecessary
 
  -- Oliver Grawert <ogra@ubuntu.com>  Fri,  2 Dec 2005 11:45:05 +0100
@@ -887,7 +895,7 @@ initramfs-tools (0.40ubuntu4) dapper; urgency=low
 initramfs-tools (0.40ubuntu3) dapper; urgency=low
 
   "A true friend stabs you in the front."
-  - Oscar Wilde 
+  - Oscar Wilde
 
   * hooks/acpid: Rename to ...
   * hooks/thermal: ... this.  Add therm_pm72 for ppc64 systems.
@@ -933,7 +941,7 @@ initramfs-tools (0.41) unstable; urgency=high
 
   * High urgency upload to cope with newer udev upstream - bonus:
     condition to test against when udev is ready. (Closes: #341014)
-    Thanks Marco d'Itri <md@linux.it> for guidance and 
+    Thanks Marco d'Itri <md@linux.it> for guidance and
     Heikki Henriksen <heikkih@gmail.com> for double check.
 
   * Pump udev dep on 0.076-3.
@@ -978,7 +986,7 @@ initramfs-tools (0.39) unstable; urgency=medium
   * Pump udev dependency.
 
   * init: Pump timeout as there is currently no way to check which udevd
-    processes are still running and why. 
+    processes are still running and why.
     Cures hopefully breakage of missing devices on boot.
 
   * Sync with latest Ubuntu.
@@ -1048,7 +1056,7 @@ initramfs-tools (0.37) unstable; urgency=low
     Exit if it doesn't exist before including current dir.
     Thanks to Jean Charles Delepine <delepine@nnx.com> (Closes: #335505)
 
-  * hooks/lvm, hooks/md: Remove FIXME's at second thought.  You better want 
+  * hooks/lvm, hooks/md: Remove FIXME's at second thought.  You better want
     to check against the binaries for your not yet created raid/lvm.
 
  -- maximilian attems <maks@sternwelten.at>  Wed, 26 Oct 2005 09:22:58 +0200
@@ -1065,7 +1073,7 @@ initramfs-tools (0.36ubuntu1) dapper; urgency=low
 initramfs-tools (0.36) unstable; urgency=low
 
   "Sunny Autumn Release"
-  
+ 
   * Minor cleanups in mkiniramfs.
 
   * Remove manpage section about return values. Needs to be rephrased.
@@ -1149,7 +1157,7 @@ initramfs-tools (0.30) unstable; urgency=low
   [ maximilian Attems ]
 
   * Resynconise with latest upstream now we are in unstable.
-  
+
   [ Jeff Bailey ]
   * debian/rules: Make sure hooks and scripts are chmod +x
 
@@ -1197,7 +1205,7 @@ initramfs-tools (0.29) breezy; urgency=low
 
 initramfs-tools (0.28) breezy; urgency=low
 
-  * Run udevstart after loading block drivers - should fix resume from 
+  * Run udevstart after loading block drivers - should fix resume from
     hibernate on non-LVM systems.
 
  -- Matthew Garrett <mjg59@srcf.ucam.org>  Tue, 20 Sep 2005 01:13:31 +0100
@@ -1228,7 +1236,7 @@ initramfs-tools (0.27) unstable; urgency=low
 initramfs-tools (0.26) breezy; urgency=low
 
   "Experience is one thing you can't get for nothing."
-  - Oscar Wilde 
+  - Oscar Wilde
 
   * scripts/local-top/lvm: Reduce -- to - in VG strings for feeding
     to vgchange.  (Ubuntu: #13387)
@@ -1264,7 +1272,7 @@ initramfs-tools (0.26) breezy; urgency=low
   * debian/dirs: Add etc/mkinitramfs/hooks, move all scripts subdirs
     into etc/mkinitramfs/scripts.
 
-  * mkinitramfs: Set the umask.  Copy the scripts from  
+  * mkinitramfs: Set the umask.  Copy the scripts from
     /etc/mkinitramfs/scripts into the image.
     Make sure that modules file lists is actually a regular file.
 
@@ -1441,9 +1449,9 @@ initramfs-tools (0.17) breezy; urgency=low
    genius."
   - Oscar Wilde
 
-  * debian/initramfs-tools.postinst: Get the name of the config file 
+  * debian/initramfs-tools.postinst: Get the name of the config file
     right when seeding RESUME=.  Also fix the sed expression.
-    Thanks to Matthew Garrett for noticing this!  
+    Thanks to Matthew Garrett for noticing this!
 
  -- Jeff Bailey <jbailey@ubuntu.com>  Wed, 10 Aug 2005 11:54:07 -0400
 
@@ -1459,7 +1467,7 @@ initramfs-tools (0.16) breezy; urgency=low
   * scripts/functions: Be silent when adding non-detected modules.
 
   * conf/mkinitramfs.conf: MODULES=most by default, BUSYBOX=y
-    (Non-busybox isn't supported now.  It's not clear that it ever 
+    (Non-busybox isn't supported now.  It's not clear that it ever
      will be).  Add RESUME line for resuming from suspend-to-disk.
 
   * scripts/local-premount/suspend: New script for suspend-to-disk.
@@ -1568,7 +1576,7 @@ initramfs-tools (0.13) breezy; urgency=low
     Use DESTDIR instead of TMPDIR
     Add ability to link in extra hunks into the cpio file
     Cosmetic cleanups
-    
+ 
   * scripts/functions: Add lsb stype log_FOO_msg functions
 
   * scripts/local: Add logging
diff --git a/debian/copyright b/debian/copyright
index 3a3bc5b..2c681c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ The Debian tree is maintained with "bzr" at:
 http://debian.stro.at/bzr-test/initramfs-tools/
 
 Authors: Jeff Bailey <jbailey@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>,
-	 Scott James Remnant <scott@ubuntu.com>, 
+	 Scott James Remnant <scott@ubuntu.com>,
 	 maximilian attems <maks@sternwelten.at>
 
 Copyright: 2005 Jeff Bailey
diff --git a/docs/example_hook b/docs/example_hook
index de5392d..a0d015a 100644
--- a/docs/example_hook
+++ b/docs/example_hook
@@ -12,7 +12,7 @@
 #	added to the initramfs, but the linux-image it relates to has
 #	already been installed previously?  Does this happen often
 #	enough that it needs to be handled?  How can it be handled?
-#	
+#
 #	* Think about the 'usplash'.  The initramfs will need to be
 #	 updated if a theme change or update is desired.  Maybe it
 #	 should not be totally automatic, but offered on upgrade
@@ -96,9 +96,9 @@ fi
 #
 if [ -n "$an_error_occured" ];
 then
-	# 
+	#
 	# TODO: Do we need 'warn()', 'error()', and/or 'fatal()' for this?
-	# 
+	#
 	echo "An error occured in $0: $an_error_occured" >&2
 	exit 1
 	#
diff --git a/docs/example_hook_cpiogz b/docs/example_hook_cpiogz
index dcd1416..f3e44d9 100644
--- a/docs/example_hook_cpiogz
+++ b/docs/example_hook_cpiogz
@@ -50,7 +50,7 @@ esac
 #	corresponding 'linux-image' package?  Can it declare that, in
 #	the case where it's an add-on that the 'linux-image' is not
 #	aware of?  This might be an apt and dpkg issue.
-#	
+#
 #	* Eg. an optional usplash or suspend2ui_fbsplash package.
 #
 . /etc/default/mypackage-initramfs
diff --git a/docs/example_script b/docs/example_script
index 221c888..d7f407f 100644
--- a/docs/example_script
+++ b/docs/example_script
@@ -70,12 +70,12 @@ echo "Got here!"
 
 if [ -n "$an_error_occured" ];
 then
-	# 
+	#
 	# TODO: Do we need 'warn()', 'error()', and/or 'fatal()' for this?
 	# I think we ultimately do, and that they need to be in their own
 	# well-documented location so that an overlay can override them.
 	# Think 'usplash' progress updates.
-	# 
+	#
 	echo "An error occured in $0: $an_error_occured" >&2
 	exit 1
 	#
diff --git a/hooks/lvm b/hooks/lvm
index 98c0e0a..49a8887 100755
--- a/hooks/lvm
+++ b/hooks/lvm
@@ -23,5 +23,5 @@ fi
 copy_exec /lib/lvm-200/vgchange /sbin
 
 for x in dm_mod dm_snapshot dm_mirror; do
-        manual_add_modules ${x}
+	manual_add_modules ${x}
 done
diff --git a/hooks/md b/hooks/md
index becaba1..df2abc8 100755
--- a/hooks/md
+++ b/hooks/md
@@ -24,5 +24,5 @@ copy_exec /sbin/mdadm /sbin
 copy_exec /sbin/mdrun /sbin
 
 for x in md linear raid0 raid1 raid5 raid6 raid10; do
-        manual_add_modules ${x}
+	manual_add_modules ${x}
 done
diff --git a/init b/init
index f66281c..eb14326 100755
--- a/init
+++ b/init
@@ -18,7 +18,7 @@ fi
 mount -t tmpfs -o size=$tmpfs_size,mode=0755 udev /dev
 > /dev/.initramfs-tools
 mkdir /dev/.initramfs
-mknod /dev/console c 5 1 
+mknod /dev/console c 5 1
 mknod /dev/null c 1 3
 
 # Export the dpkg architecture
diff --git a/initramfs-tools.8 b/initramfs-tools.8
index 5d7c105..5712bdd 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -4,19 +4,19 @@
 initramfs-tools \- an introduction to writing scripts for mkinitramfs
 
 .SH DESCRIPTION
-initramfs-tools has one main script and two different sets of subscripts which 
+initramfs-tools has one main script and two different sets of subscripts which
 will be used during different phases of execution. Each of these will be
 discussed separately below with the help of an imaginary tool which performs a
 frobnication of a lvm partition prior to mounting the root partition.
 
 .SS Hook scripts
-These are used when an initramfs image is created and not included in the 
+These are used when an initramfs image is created and not included in the
 image itself. They can however cause files to be included in the image.
 
 .SS Boot scripts
-These are included in the initramfs image and normally executed during 
+These are included in the initramfs image and normally executed during
 kernel boot in the early user-space before the root partition has been
-mounted. 
+mounted.
 
 initramfs-tools uses shell variable names for handling dependencies.
 Notice that `-' is not a valid shell variable name and thus should
@@ -40,7 +40,7 @@ the device node to mount as the rootfs.
 .TP
 \fB \fI nfsroot
 can be either "auto" to try to get the relevant information from DHCP or a
-string of the form NFSSERVER:NFSPATH 
+string of the form NFSSERVER:NFSPATH
 
 .TP
 \fB \fI boot
@@ -79,7 +79,7 @@ Hooks can be found in two places: /usr/share/initramfs-tools/hooks and
 /etc/initramfs-tools/hooks. They are executed during generation of the
 initramfs-image and are responsible for including all the necessary components
 in the image itself. No guarantees are made as to the order in which the
-different scripts are executed unless the prereqs are setup in the script. 
+different scripts are executed unless the prereqs are setup in the script.
 
 .SS Header
 In order to support prereqs, each script should begin with the following lines:
@@ -113,7 +113,7 @@ the lvm hook script is run before your custom script.
 /usr/share/initramfs-tools/hook-functions contains a number of functions which
 deal with some common tasks in a hook script:
 .TP
-\fB \fI 
+\fB \fI
 manual_add_modules
 adds a module (and any modules which it depends on) to the initramfs image.
 .RS
@@ -389,7 +389,7 @@ if [ ! -e "/dev/mapper/frobb" ]; then
 	panic "Frobnication device not found"
 fi
 
-log_begin_msg "Starting frobnication"		
+log_begin_msg "Starting frobnication"
 /sbin/frobnicate "/dev/mapper/frobb" || panic "Frobnication failed"
 log_end_msg
 
@@ -398,7 +398,7 @@ exit 0
 .RE
 
 .SH DEBUG
-It is easy to check the generated initramfs for its content. One may need 
+It is easy to check the generated initramfs for its content. One may need
 to double-check if it contains the relevant binaries, libs or modules:
 .RS
 .nf
diff --git a/initramfs.conf.5 b/initramfs.conf.5
index 2874fdb..afd799b 100644
--- a/initramfs.conf.5
+++ b/initramfs.conf.5
@@ -5,7 +5,7 @@ initramfs.conf \- configuration file for mkinitramfs
 
 .SH DESCRIPTION
 The behaviour of
-.B mkinitramfs 
+.B mkinitramfs
 can be modified by its configuration file.
 
 Each line in the file can be a configuration variable, a blank line,
@@ -35,7 +35,7 @@ The default setting is \fImost\fP.
 .SH NFS VARIABLES
 .TP
 \fB BOOT
-Allows to use an nfs drive as the root of the drive. 
+Allows to use an nfs drive as the root of the drive.
 The default is to boot of an \fIlocal\fP media (harddrive, USB stick).
 Set to \fInfs\fP for an NFS root share.
 
diff --git a/mkinitramfs b/mkinitramfs
index 6c048df..81a859e 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -8,7 +8,7 @@ CONFDIR="/etc/initramfs-tools"
 verbose="n"
 errors_to="2>/dev/null"
 # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
-BUSYBOXDIR="/bin" 
+BUSYBOXDIR="/bin"
 
 OPTIONS=`getopt -o d:ko:r:v --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
 
@@ -110,18 +110,18 @@ check_minkver ${version} ${CONFDIR}/hooks
 
 case "${version}" in
 /lib/modules/*/[!/]*)
-        ;;
+	;;
 /lib/modules/[!/]*)
-        version="${version#/lib/modules/}"
-        version="${version%%/*}"
-        ;;
+	version="${version#/lib/modules/}"
+	version="${version%%/*}"
+	;;
 esac
 
 case "${version}" in
 */*)
-        echo "$PROG: ${version} is not a valid kernel version" >&2
-        exit 1
-        ;;
+	echo "$PROG: ${version} is not a valid kernel version" >&2
+	exit 1
+	;;
 esac
 
 if [ -d "${outfile}" ]; then
@@ -157,7 +157,7 @@ export verbose
 export __TMPCPIOGZ
 
 for d in bin conf/conf.d etc lib modules sbin scripts; do
-    mkdir -p "${DESTDIR}/${d}"
+	mkdir -p "${DESTDIR}/${d}"
 done
 
 # MODULES=list case.  Always honour.
@@ -228,7 +228,7 @@ fi
 (cd "${DESTDIR}" && find . | cpio --quiet --dereference -o -H newc | gzip -9 >"${outfile}") || exit 1
 
 if [ -s "${__TMPCPIOGZ}" ]; then
-    cat "${__TMPCPIOGZ}" >>"${outfile}" || exit 1
+	cat "${__TMPCPIOGZ}" >>"${outfile}" || exit 1
 fi
 
 if [ "${keep}" = "y" ]; then
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index 437b0ac..df3dc0c 100755
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -79,20 +79,20 @@ version="${1}"
 
 case "${version}" in
 /lib/modules/*/[!/]*)
-        ;;
+	;;
 /lib/modules/[!/]*)
-        version="${version#/lib/modules/}"
-        version="${version%%/*}"
-        ;;
+	version="${version#/lib/modules/}"
+	version="${version%%/*}"
+	;;
 esac
 
 case "${version}" in
 */*)
-        echo "$PROG: ${version} is not a valid kernel version" >&2
-        exit 1
-        ;;
+	echo "$PROG: ${version} is not a valid kernel version" >&2
+	exit 1
+	;;
 esac
 
-# linux-image installs latest version 
+# linux-image installs latest version
 mkinitramfs -o ${outfile} ${version}
 sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}"
diff --git a/mkinitramfs-kpkg.8 b/mkinitramfs-kpkg.8
index 0bdc1dc..871a0f4 100644
--- a/mkinitramfs-kpkg.8
+++ b/mkinitramfs-kpkg.8
@@ -5,8 +5,8 @@ mkinitramfs-kpkg \- generates an initramfs image for kernel-package
 
 .SH SYNOPSIS
 .B mkinitramfs
-.RB [ \-o 
-.IR outfile ] 
+.RB [ \-o
+.IR outfile ]
 .RI [ version ]
 .B mkinitramfs
 .RB [ \-\-supported-host-version=
@@ -29,7 +29,7 @@ for an better alternative.
 
 .TP
 \fB \-o \fI outfile
-Write the image to 
+Write the image to
 .IR outfile .
 
 .TP
diff --git a/mkinitramfs.8 b/mkinitramfs.8
index 5af552b..3dc2e2e 100644
--- a/mkinitramfs.8
+++ b/mkinitramfs.8
@@ -5,13 +5,13 @@ mkinitramfs \- generate an initramfs image
 
 .SH SYNOPSIS
 .B mkinitramfs
-.RB [ \-d 
-.IR confdir ] 
-.RB [ \-k ] 
-.RB [ \-o 
-.IR outfile ] 
-.RB [ \-r 
-.IR root ] 
+.RB [ \-d
+.IR confdir ]
+.RB [ \-k ]
+.RB [ \-o
+.IR outfile ]
+.RB [ \-r
+.IR root ]
 .RI [ version ]
 .B mkinitramfs
 .RB [ \-\-supported-host-version=
@@ -21,17 +21,17 @@ mkinitramfs \- generate an initramfs image
 
 .SH DESCRIPTION
 The
-.B mkinitramfs 
+.B mkinitramfs
 script generates an initramfs image.
 The initramfs is a gzipped cpio archive. The archive can be used on a
 different box of the same arch with the corresponding Linux kernel.
 .B mkinitramfs
-is meant for advanced usage. On your local box 
+is meant for advanced usage. On your local box
 .B update-initramfs
 should do all necessary steps.
 
-At boot time, the kernel unpacks that archive into RAM disk, mounts and 
-uses it as initial root file system. All finding of the root device 
+At boot time, the kernel unpacks that archive into RAM disk, mounts and
+uses it as initial root file system. All finding of the root device
 happens in this early userspace.
 
 .SH OPTIONS
@@ -45,14 +45,14 @@ Keep the temporary directory used to make the image.
 
 .TP
 \fB \-o \fI outfile
-Write the image to 
+Write the image to
 .IR outfile .
 
 .TP
 \fB \-r \fI root
-Override the 
-.B ROOT 
-setting in 
+Override the
+.B ROOT
+setting in
 .IR initramfs.conf .
 
 .TP
diff --git a/scripts/functions b/scripts/functions
index c3a3e16..53e07ca 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2,23 +2,23 @@
 
 _log_msg()
 {
-    if [ "$quiet" = "y" ]; then return; fi
-    echo "$@"
+	if [ "$quiet" = "y" ]; then return; fi
+	echo "$@"
 }
 
 log_success_msg()
 {
-    _log_msg "Success: $@"
+	_log_msg "Success: $@"
 }
 
 log_failure_msg()
 {
-    _log_msg "Failure: $@"
+	_log_msg "Failure: $@"
 }
 
 log_warning_msg()
 {
-    _log_msg "Warning: $@"
+	_log_msg "Warning: $@"
 }
 
 log_begin_msg()
@@ -190,7 +190,7 @@ load_modules()
 	if [ -e /conf/modules ]; then
 		cat /conf/modules | while read m; do
 			# Skip empty lines
-			if [ -z "$m" ];  then 
+			if [ -z "$m" ];  then
 				continue
 			fi
 			# Skip comments - d?ash removes whitespace prefix
diff --git a/scripts/local-top/udev_helper b/scripts/local-top/udev_helper
index 5a747ba..2d4c209 100755
--- a/scripts/local-top/udev_helper
+++ b/scripts/local-top/udev_helper
@@ -19,5 +19,5 @@ esac
 # but might be an old fashioned ISA controller; in which case
 # we need to load ide-generic.
 if [ ! -e "${ROOT}" -o "${ROOT}" = "/dev/root" ]; then
-    modprobe -q ide-generic
+	modprobe -q ide-generic
 fi
diff --git a/update-initramfs b/update-initramfs
index 866609e..85a5dd2 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -189,7 +189,7 @@ create()
 		if version_exists "${version}"; then
 			panic "Cannot create version ${version}: already exists"
 		fi
-	
+
 		if [ -e "${initramfs}" ]; then
 			panic "${initramfs} already exists, cannot create."
 		fi
@@ -257,7 +257,7 @@ delete()
 	if [ ! -e "${initramfs}" ]; then
 		panic "Cannot delete ${initramfs}, doesn't exist."
 	fi
-	
+
 	if ! version_exists "${version}"; then
 		panic "Cannot delete version ${version}: Not created by this utility."
 	fi
@@ -291,7 +291,7 @@ takeover=0
 while getopts "k:cudyvtb:h?" flag; do
 	case "${flag}" in
 	k)
-		version="${OPTARG}"	
+		version="${OPTARG}"
 		;;
 	c)
 		mode="c"
diff --git a/update-initramfs.8 b/update-initramfs.8
index 9590ca3..a36e83c 100644
--- a/update-initramfs.8
+++ b/update-initramfs.8
@@ -5,25 +5,25 @@ update-initramfs \- generate an initramfs image
 
 .SH SYNOPSIS
 .B update-initramfs
-.RB [ \-k 
-.IR version ] 
-.RB [ \-c ] 
-.RB [ \-u ] 
-.RB [ \-t ] 
-.RB [ \-v ] 
-.RB [ \-b ] 
-.RB [ \-h ] 
+.RB [ \-k
+.IR version ]
+.RB [ \-c ]
+.RB [ \-u ]
+.RB [ \-t ]
+.RB [ \-v ]
+.RB [ \-b ]
+.RB [ \-h ]
 .SH DESCRIPTION
 The
-.B update-initramfs 
+.B update-initramfs
 script manages your initramfs images on your local box.
 It keeps track of the existing initramfs archives in /boot.
 There are three modes of operation create, update or delete.
 You must at least specify one of those modes.
 
-The initramfs is a gzipped cpio archive. 
-At boot time, the kernel unpacks that archive into RAM disk, mounts and 
-uses it as initial root file system. All finding of the root device 
+The initramfs is a gzipped cpio archive.
+At boot time, the kernel unpacks that archive into RAM disk, mounts and
+uses it as initial root file system. All finding of the root device
 happens in this early userspace.
 
 .SH OPTIONS
@@ -59,7 +59,7 @@ Set an different bootdir for the image creation.
 
 .TP
 \fB \-h
-Print a short help page describing the available options in 
+Print a short help page describing the available options in
 .B update-initramfs.
 
 .SH AUTHOR
-- 
cgit v1.2.3


From af88873884da184d98fffd08bf96f3b276b187a2 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Wed, 2 May 2007 10:15:01 +0200
Subject: mkinitramfs: old linux-image interfaces deprecate them as they should
 get scrapped next release (keep them for backports.org and friends)

---
 mkinitramfs      | 1 +
 mkinitramfs-kpkg | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'mkinitramfs-kpkg')

diff --git a/mkinitramfs b/mkinitramfs
index e7b9b13..a2e643c 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -63,6 +63,7 @@ while true; do
 	esac
 done
 
+# FIXME: remove after Lenny (needed for Etch linux-images)
 if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
 	if [ -n "$supported_host_version" ]; then
 		host_upstream_version="${supported_host_version%%-*}"
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index df3dc0c..ea0e783 100755
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -6,6 +6,8 @@ supported_host_version=""
 supported_target_version=""
 outfile=""
 
+# FIXME: drop script after Lenny (needed for Etch linux-images)
+
 usage()
 {
 	cat >&2 << EOF
-- 
cgit v1.2.3


From 7810a813a81cb13b6ae425fc10935270a37d72c7 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Thu, 5 Feb 2009 20:04:46 +0100
Subject: mkinitramfs-kpkg: deprecate it's usage.

update-initramfs is the desired caller.
---
 mkinitramfs-kpkg | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mkinitramfs-kpkg')

diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index ea0e783..07cbd44 100755
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -95,6 +95,8 @@ case "${version}" in
 	;;
 esac
 
+echo "Depreciation WARNING: use update-initramfs(8)" >&2
+
 # linux-image installs latest version
 mkinitramfs -o ${outfile} ${version}
 sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}"
-- 
cgit v1.2.3


From 0a8c484f6341229054865ba8e1467c9b21e5c2a0 Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@ftbfs.org>
Date: Thu, 26 Feb 2009 20:38:58 -0800
Subject: mkinitramfs-kpkg misspells "deprecation" as "depreciation"

mkinitramfs-kpkg outputs the following warning:

 Depreciation WARNING: use update-initramfs(8)

"Depreciation" should be "Deprecation".

(closes: #517344)


Signed-off-by: maximilian attems <maks@debian.org>
---
 mkinitramfs-kpkg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkinitramfs-kpkg')

diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index 07cbd44..6beaad5 100755
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -95,7 +95,7 @@ case "${version}" in
 	;;
 esac
 
-echo "Depreciation WARNING: use update-initramfs(8)" >&2
+echo "Deprecation WARNING: use update-initramfs(8)" >&2
 
 # linux-image installs latest version
 mkinitramfs -o ${outfile} ${version}
-- 
cgit v1.2.3