From f85c07402c234553cf4831efbda0cd2f3869138e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 25 Feb 2010 04:07:57 +0100
Subject: [PATCH] initramfs-tools: update to 0.98.

update-initramfs: added two new flags -V and -B:
 -V: prints initramfs-tools version.
 -B: do not run grub-mkconfig.

--HG--
extra : convert_revision : 700fe54a0323ad7b8c34af85cfa7f52fe43ce63d
---
 .../initramfs-tools/files/update-initramfs    | 15 ++++++++++++--
 .../initramfs-tools/files/update-initramfs.8  | 20 ++++++++++++++++---
 srcpkgs/initramfs-tools/template              |  3 ++-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/initramfs-tools/files/update-initramfs b/srcpkgs/initramfs-tools/files/update-initramfs
index 4576f157fce..b167344a7d1 100755
--- a/srcpkgs/initramfs-tools/files/update-initramfs
+++ b/srcpkgs/initramfs-tools/files/update-initramfs
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+INITRAMFS_TOOLS_VERSION=@VERSION@
 STATEDIR=/var/lib/initramfs-tools
 BOOTDIR=/boot
 CONF=/etc/initramfs-tools/update-initramfs.conf
@@ -23,7 +24,9 @@ Options:
  -d		Remove an existing initramfs
  -t		Take over a custom initramfs with this one
  -b		Set alternate boot directory
+ -B		Do not update bootloader configuration file
  -v		Be verbose
+ -V		Show initramfs-tools version
  -h		This message
 
 EOF
@@ -331,7 +334,7 @@ update()
 
 	generate_initramfs
 
-	run_bootloader
+	[ -n "${dogrub}" ] && run_bootloader
 
 	backup_booted_initramfs
 }
@@ -380,11 +383,15 @@ verbose=0
 yes=0
 # We default to takeover=1 in Ubuntu, but not Debian
 takeover=0
+dogrub=1
 
 ##
 
-while getopts "k:cudyvtb:h?" flag; do
+while getopts "k:cudyvtb:h?BV" flag; do
 	case "${flag}" in
+	B)
+		unset dogrub
+		;;
 	k)
 		version="${OPTARG}"
 		;;
@@ -413,6 +420,10 @@ while getopts "k:cudyvtb:h?" flag; do
 			exit 1
 		fi
 		;;
+	V)
+		echo "${INITRAMFS_TOOLS_VERSION}"
+		exit 0
+		;;
 	h|?)
 		usage
 		;;
diff --git a/srcpkgs/initramfs-tools/files/update-initramfs.8 b/srcpkgs/initramfs-tools/files/update-initramfs.8
index bf5080b4f02..5cdfdd11d34 100644
--- a/srcpkgs/initramfs-tools/files/update-initramfs.8
+++ b/srcpkgs/initramfs-tools/files/update-initramfs.8
@@ -1,4 +1,4 @@
-.TH UPDATE-INITRAMFS 8  "2008/12/19" "Linux" "update\-initramfs manual"
+.TH UPDATE-INITRAMFS 8  "2010/02/25" "Linux" "update\-initramfs manual"
 
 .SH NAME
 update\-initramfs \- generate an initramfs image
@@ -10,7 +10,9 @@ update\-initramfs \- generate an initramfs image
 .IR version ]
 .RB [ \-t ]
 .RB [ \-v ]
+.RB [ \-V ]
 .RB [ \-b ]
+.RB [ \-B ]
 .RB [ \-h ]
 .SH DESCRIPTION
 The
@@ -61,10 +63,19 @@ Allows to take over an custom initramfs with a newer one.
 This option increases the amount of information you are given during
 the chosen action.
 
+.TP
+\fB \-V
+Prints the current initramfs-tools version.
+
 .TP
 \fB \-b
 Set an different bootdir for the image creation.
 
+.TP
+\fB \-B
+Do not update the boot configuration file (grub.cfg for grub2) after
+building successfully the initramfs.
+
 .TP
 \fB \-h
 Print a short help page describing the available options in
@@ -77,7 +88,6 @@ Update the initramfs of the newest kernel:
 .PP
 .B update\-initramfs -u
 
-
 Create the initramfs for a specific kernel:
 
 .PP
@@ -87,7 +97,11 @@ Create the initramfs for a specific kernel:
 /etc/initramfs-tools/update-initramfs.conf
 
 .SH AUTHOR
-The initramfs-tools are written by Maximilian Attems <maks@debian.org>,
+The initramfs-tools available in XBPS are maintained by
+Juan Romero Pardines <xtraeme@gmail.com>, they diverged substantially
+from the original implementation comming from Debian.
+
+The initramfs-tools from Debian are written by Maximilian Attems <maks@debian.org>,
 Jeff Bailey <jbailey@raspberryginger.com> and numerous others.
 
 .SH SEE ALSO
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 39ef3f0082f..11e1c1fc961 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-version=0.97.2
+version=0.98
 build_style=custom-install
 short_desc="Tools for generating an initramfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -95,4 +95,5 @@ do_install()
 	# Scripts
 	install -m 755 $FILESDIR/mkinitramfs $DESTDIR/usr/sbin
 	install -m 755 $FILESDIR/update-initramfs $DESTDIR/usr/sbin
+	sed -i -e "s|@VERSION@|${version}|g" $DESTDIR/usr/sbin/update-initramfs
 }