resync ubuntu24 aka nice conf.d

9 files changed, 63 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 74facf0..bef47a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,15 +4,18 @@ initramfs-tools (0.53) unstable; urgency=high
     /boot/initrd-`uname -r` and not /boot/vmlinu?-`uname -r`.
     Otherwise this builds initramfs for newer handbuild trees too.
 
-  * Resync with 0.40ubuntu22:
+  * Resync with 0.40ubuntu24:
     - mptspi already included
     - keep nfsmount for now, we don't want to add further busybox deps.
+    - adds mptfc and mptsas modules (closes: #341930)
+    - adds MODULES=netboot support (closes: #352669)
   * Further reduce ubuntudiff:
     - scripts/functions: remove duplicate dir check.
     - scripts/nfs: add quiet to modules loading.
 
   * Add kernel-package compat stuff, behaves like mkinitramfs,
-    but adds the sha1sum for update-initramfs.
+    but adds the sha1sum for update-initramfs. Reset takeover=0.
+    (closes: #353809)
 
  -- maximilian attems <maks@sternwelten.at>  Thu, 23 Feb 2006 16:59:56 +0100
 
@@ -165,6 +168,24 @@ initramfs-tools (0.42) unstable; urgency=low
       even if bootloader setting is preferred.
 
  -- maximilian attems <maks@sternwelten.at>  Mon,  5 Dec 2005 12:59:59 +0100
+
+initramfs-tools (0.40ubuntu24) dapper; urgency=low
+
+  * Add support for LSI Logic's Fusion MPT SAS and FC controllers as well.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 23 Feb 2006 23:27:16 +1100
+
+initramfs-tools (0.40ubuntu23) dapper; urgency=low
+
+  * Grow a conf.d directory for config snippets, and toss the RESUME option
+    in there, to stop editing our own conffile in our maintainer scripts.
+  * Add a cleverly hackish preinst that will pull the RESUME setting from
+    old config files, migrate it to conf.d/resume, and reset that part of the
+    conffile to a factory fresh state.  This should fix the unwanted conffile
+    prompt in breezy->dapper upgrades for people who made no local changes.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 17 Feb 2006 15:34:53 +1100
+
 initramfs-tools (0.40ubuntu22) dapper; urgency=low
 
   * Add mptspi to the list of SCSI modules put in the initramfs by default,
diff --git a/debian/initramfs-tools.dirs b/debian/initramfs-tools.dirs
index ba4ac4d..9325057 100644
--- a/debian/initramfs-tools.dirs
+++ b/debian/initramfs-tools.dirs
@@ -8,5 +8,6 @@ etc/mkinitramfs/scripts/nfs-bottom
 etc/mkinitramfs/scripts/nfs-premount
 etc/mkinitramfs/scripts/nfs-top
 etc/mkinitramfs/hooks
+etc/mkinitramfs/conf.d
 usr/share/initramfs-tools/modules.d
 /var/lib/initramfs-tools
diff --git a/debian/initramfs-tools.postinst b/debian/initramfs-tools.postinst
index c6025e5..63ceef8 100644
--- a/debian/initramfs-tools.postinst
+++ b/debian/initramfs-tools.postinst
@@ -25,7 +25,7 @@ if [ "$1" = configure ]; then
 		fi
 
 		if [ -e ${RESUME} ]; then
-			sed -i -e "s@#RESUME=@RESUME=${RESUME}@" /etc/mkinitramfs/initramfs.conf
+			echo "RESUME=${RESUME}" > /etc/mkinitramfs/conf.d/resume
 		fi
 
 		if [ -e /etc/mkinitrd/DSDT ]; then
diff --git a/debian/initramfs-tools.postrm b/debian/initramfs-tools.postrm
index 2af9945..0c2d39a 100644
--- a/debian/initramfs-tools.postrm
+++ b/debian/initramfs-tools.postrm
@@ -2,6 +2,7 @@
 
 if [ "x${1}" = "xpurge" ]; then
 	rm -f /etc/mkinitramfs/modules
+	rm -f /etc/mkinitramfs/conf.d/resume
 fi
 
 #DEBHELPER#
diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst
new file mode 100644
index 0000000..3582290
--- /dev/null
+++ b/debian/initramfs-tools.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+[ -f /etc/mkinitramfs/initramfs.conf ] && . /etc/mkinitramfs/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
+fi
+
+#DEBHELPER#
diff --git a/hook-functions b/hook-functions
index 51e0a8d..9b0d949 100644
--- a/hook-functions
+++ b/hook-functions
@@ -153,7 +153,7 @@ auto_add_modules()
 		done
 	;;
 	scsi)
-		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptscsih mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
+		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic cciss ch dc395x dmx3191d dpt_i2o eata fdomain 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_promise sata_nv sata_qstor sata_sil sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc scsi_mod scsi_transport_fc scsi_transport_iscsi scsi_transport_spi sd_mod sym53c8xx tmscsim; do
 			manual_add_modules "${x}"
 		done
 	;;
diff --git a/init b/init
index f4ec157..1e4e2fd 100755
--- a/init
+++ b/init
@@ -23,6 +23,9 @@ export DPKG_ARCH=
 
 # Bring in the main config
 . /conf/initramfs.conf
+for i in conf/conf.d/*; do
+       [ -f ${i} ] && . ${i}
+done
 . /scripts/functions
 
 # Parse command line options
diff --git a/initramfs.conf.5 b/initramfs.conf.5
index c289ee2..7fb79b1 100644
--- a/initramfs.conf.5
+++ b/initramfs.conf.5
@@ -12,6 +12,12 @@ Each line in the file can be a configuration variable, a blank line,
 or a comment. The value of an variable is assigned by an statement
 of the form: \fIname\fP=[\fIvalue\fP]
 
+Configuration options can be broken out into configuration snippets and
+placed in individual files in the /etc/mkinitramfs/conf.d directory.  Files
+in this directory are always read \fBafter\fP the main configuration file,
+so you can override the settings in the main config file without editing it
+directly.
+
 .SH GENERAL VARIABLES
 .TP
 \fB MODULES
@@ -30,7 +36,8 @@ The default setting is \fImost\fP.
 \fB RESUME
 Optional setting of the swap partition to resume from.
 The resume= passed on the command line of your boot loader 
-will override this setting.
+will override this setting.    By default, this is set in
+/etc/mkinitramfs/conf.d/resume.
 
 .SH NFS VARIABLES
 .TP
diff --git a/mkinitramfs b/mkinitramfs
index 6c2be32..06e892d 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -77,6 +77,13 @@ fi
 . /usr/share/initramfs-tools/hook-functions
 
 . "${CONFDIR}/initramfs.conf"
+EXTRA_CONF=''
+for i in ${CONFDIR}/conf.d/*; do
+       EXTRA_CONF="${EXTRA_CONF} $(basename $i | grep '^[a-z0-9][a-z0-9\._-]*$' | grep -v '\.dpkg-.*$')";
+done
+for i in ${EXTRA_CONF}; do
+. ${CONFDIR}/conf.d/${i}
+done
 
 if [ -z "${outfile}" ]; then
 	usage
@@ -139,7 +146,7 @@ export DPKG_ARCH
 # Private, used by 'catenate_cpiogz'.
 export __TMPCPIOGZ
 
-for d in bin conf etc lib modules sbin scripts; do
+for d in bin conf/conf.d etc lib modules sbin scripts; do
     mkdir -p "${DESTDIR}/${d}"
 done
 
@@ -178,6 +185,9 @@ cp -p "${CONFDIR}/scripts/${f}" "${DESTDIR}/scripts/$(dirname "${f}")"
 done
 echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf
 copy_exec "${CONFDIR}/initramfs.conf" /conf
+for i in ${EXTRA_CONF}; do
+       copy_exec ${CONFDIR}/conf.d/${i} /conf/conf.d
+done
 
 # Busybox
 rm -f ${DESTDIR}/bin/sh