Bug#811425: marked as done (jessie-pu: package initramfs-tools/0.120+deb8u1)

To: "Adam D. Barratt" <adam@adam-barratt.org.uk>
Subject: Bug#811425: marked as done (jessie-pu: package initramfs-tools/0.120+deb8u1)
From: owner@bugs.debian.org (Debian Bug Tracking System)
Date: Sat, 02 Apr 2016 13:22:19 +0000
Message-id: <[🔎] handler.811425.D811425.14596032225348.ackdone@bugs.debian.org>
References: <1459603204.2441.216.camel@adam-barratt.org.uk> <145314692795.1927.257213514315270751.reportbug@deadeye.wl.decadent.org.uk>

Your message dated Sat, 02 Apr 2016 14:20:04 +0100
with message-id <1459603204.2441.216.camel@adam-barratt.org.uk>
and subject line Fix included in stable
has caused the Debian Bug report #811425,
regarding jessie-pu: package initramfs-tools/0.120+deb8u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
811425: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811425
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

--- Begin Message ---

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: jessie-pu: package initramfs-tools/0.120+deb8u1
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 18 Jan 2016 19:55:27 +0000
Message-id: <145314692795.1927.257213514315270751.reportbug@deadeye.wl.decadent.org.uk>

Package: release.debian.org
Severity: normal
Tags: jessie patch
User: release.debian.org@packages.debian.org
Usertags: pu

There are a number of important bugs in jessie's version of
initramfs-tools that are now fixed in unstable, and that have
quite simple and low-risk fixes.  See the debdiff below.

Ben.

diff -Nru initramfs-tools-0.120/debian/changelog initramfs-tools-0.120+deb8u1/debian/changelog
--- initramfs-tools-0.120/debian/changelog	2015-04-13 01:18:17.000000000 +0100
+++ initramfs-tools-0.120+deb8u1/debian/changelog	2016-01-18 18:26:07.000000000 +0000
@@ -1,3 +1,31 @@
+initramfs-tools (0.120+deb8u1) jessie; urgency=medium
+
+  [ Ben Hutchings ]
+  * [c367d7d] scripts/functions: Use shell to create stamp file instead of
+    'touch' (Closes: #783291)
+  * [d22b95b] update-initramfs: Run 'sync' after writing the initramfs
+    (Closes: #783620)
+  * [c22cefe] hook-functions: Add support for nvme devices with MODULES=dep
+    (Closes: #785147)
+  * [e0b23a1] hook-functions: Add support for LVM/LUKS on mmcblk and nvme
+    devices with MODULES=dep (Closes: #747871, #810808)
+  * [0e905aa] scripts/functions: Fix fsck display options (Closes: #781239)
+
+  [ Laurent Bigonville ]
+  * [3c4b38a] Support fsck.mode= and fsck.repair= parameters as known by
+    systemd-fsck (Closes: #783410, #792557)
+  * [dcb0f0c] Run new panic scripts just before dropping to a shell
+    (Closes: #602331)
+
+  [ Boris Egorov ]
+  * [2c82cf4] mkinitramfs: fix bashism in script (Closes: #633582)
+
+  [ Andy Whitcroft ]
+  * [97b664e] When adding i8042 also add psmouse as some keyboards are behind
+    the mouse (Closes: #795839)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 Jan 2016 18:23:05 +0000
+
 initramfs-tools (0.120) unstable; urgency=medium
 
   * [23ee5f9] Add '.log' to fsck log output file, and document its existence
diff -Nru initramfs-tools-0.120/debian/initramfs-tools.dirs initramfs-tools-0.120+deb8u1/debian/initramfs-tools.dirs
--- initramfs-tools-0.120/debian/initramfs-tools.dirs	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/debian/initramfs-tools.dirs	2016-01-18 18:07:21.000000000 +0000
@@ -7,6 +7,7 @@
 etc/initramfs-tools/scripts/nfs-bottom
 etc/initramfs-tools/scripts/nfs-premount
 etc/initramfs-tools/scripts/nfs-top
+etc/initramfs-tools/scripts/panic
 etc/initramfs-tools/hooks
 etc/initramfs-tools/conf.d
 usr/share/initramfs-tools/conf.d
diff -Nru initramfs-tools-0.120/hook-functions initramfs-tools-0.120+deb8u1/hook-functions
--- initramfs-tools-0.120/hook-functions	2015-03-01 21:44:34.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/hook-functions	2016-01-18 18:19:39.000000000 +0000
@@ -367,7 +367,9 @@
 		fi
 		# luks or lvm on cciss or ida
 		if [ "${block#cciss}" != "${block}" ] \
-		|| [ "${block#ida}" != "${block}" ]; then
+		|| [ "${block#ida}" != "${block}" ] \
+		|| [ "${block#mmcblk}" != "${block}" ] \
+		|| [ "${block#nvme}" != "${block}" ]; then
 			block="${block%p*}"
 		else
 			block=${block%%[0-9]*}
@@ -434,6 +436,10 @@
 		block=${dev_node#/dev/i2o/}
 		block=${block%%[0-9]*}
 		block='i2o!'$block
+	# nvme device
+	elif [ "${dev_node#/dev/nvme}" != "${dev_node}" ]; then
+		block=${dev_node#/dev/}
+		block=${block%p*}
 	# classical block device
 	else
 		block=${dev_node#/dev/}
@@ -524,7 +530,7 @@
 			modules="$modules btrfs ext2 ext3 ext4 ext4dev "
 			modules="$modules isofs jfs reiserfs udf xfs"
 			modules="$modules nfs nfsv2 nfsv3 nfsv4"
-			modules="$modules af_packet atkbd i8042"
+			modules="$modules af_packet atkbd i8042 psmouse"
 			modules="$modules virtio_pci virtio_mmio"
 
 			# Include all HID drivers unless we're sure they
diff -Nru initramfs-tools-0.120/init initramfs-tools-0.120+deb8u1/init
--- initramfs-tools-0.120/init	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/init	2016-01-18 18:07:21.000000000 +0000
@@ -61,7 +61,7 @@
 export drop_caps=
 export fastboot=n
 export forcefsck=n
-export fsckfix=n
+export fsckfix=
 
 
 # Bring in the main config
@@ -169,15 +169,18 @@
 	BOOTIF=*)
 		BOOTIF=${x#BOOTIF=}
 		;;
-	fastboot)
+	fastboot|fsck.mode=skip)
 		fastboot=y
 		;;
-	forcefsck)
+	forcefsck|fsck.mode=force)
 		forcefsck=y
 		;;
-	fsckfix)
+	fsckfix|fsck.repair=yes)
 		fsckfix=y
 		;;
+	fsck.repair=no)
+		fsckfix=n
+		;;
 	esac
 done
 
diff -Nru initramfs-tools-0.120/mkinitramfs initramfs-tools-0.120+deb8u1/mkinitramfs
--- initramfs-tools-0.120/mkinitramfs	2015-03-01 23:18:25.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/mkinitramfs	2016-01-18 18:07:21.000000000 +0000
@@ -343,7 +343,7 @@
 
 (
 # preserve permissions if root builds the image, see #633582
-[ "$UID" != 0 ] && cpio_owner_root="-R 0:0"
+[ "$(id -ru)" != 0 ] && cpio_owner_root="-R 0:0"
 
 # work around lack of "set -o pipefail" for the following pipe:
 # cd "${DESTDIR}" && find . | cpio --quiet $cpio_owner_root -o -H newc | gzip >>"${outfile}" || exit 1
diff -Nru initramfs-tools-0.120/scripts/functions initramfs-tools-0.120+deb8u1/scripts/functions
--- initramfs-tools-0.120/scripts/functions	2015-04-13 00:56:58.000000000 +0100
+++ initramfs-tools-0.120+deb8u1/scripts/functions	2016-01-18 18:19:43.000000000 +0000
@@ -53,6 +53,9 @@
 	modprobe -v uhci-hcd || true
 	modprobe -v ohci-hcd || true
 	modprobe -v usbhid || true
+
+	run_scripts /scripts/panic
+
 	REASON="$@" PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
 }
 
@@ -358,17 +361,22 @@
 		force=""
 	fi
 
-	if [ "$fsckfix" = yes ]
+	if [ "$fsckfix" = "y" ]
 	then
 		fix="-y"
+	elif [ "$fsckfix" = "n" ]
+	then
+		fix="-n"
 	else
 		fix="-a"
 	fi
 
-	# spinner="-C" -- only if on an interactive terminal
 	spinner=""
+	if [ -z "${debug}" ]; then
+		spinner="-C"
+	fi
 
-	if [ "$VERBOSE" = no ]
+	if [ "${quiet}" = n ]
 	then
 		log_begin_msg "Will now check $NAME file system"
 		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -V -t $TYPE $DEV
@@ -376,7 +384,7 @@
 		log_end_msg
 	else
 		log_begin_msg "Checking $NAME file system"
-		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -t $TYPE $DEV
+		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -T -t $TYPE $DEV
 		FSCKCODE=$?
 		log_end_msg
 	fi
@@ -398,7 +406,7 @@
 		log_warning_msg "File system check failed but did not detect errors"
 		sleep 5
 	else
-		touch $FSCK_STAMPFILE
+		> $FSCK_STAMPFILE
 	fi
 	return 0
 }
diff -Nru initramfs-tools-0.120/update-initramfs initramfs-tools-0.120+deb8u1/update-initramfs
--- initramfs-tools-0.120/update-initramfs	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/update-initramfs	2016-01-18 18:07:21.000000000 +0000
@@ -172,6 +172,8 @@
 	if mkinitramfs ${OPTS} "${initramfs}.new" "${version}"; then
 		mv -f "${initramfs}.new" "${initramfs}"
 		set_sha1
+		# Guard against an unclean shutdown
+		sync
 	else
 		mkinitramfs_return="$?"
 		remove_initramfs_bak


-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru initramfs-tools-0.120/debian/changelog initramfs-tools-0.120+deb8u1/debian/changelog
--- initramfs-tools-0.120/debian/changelog	2015-04-13 01:18:17.000000000 +0100
+++ initramfs-tools-0.120+deb8u1/debian/changelog	2016-01-18 18:26:07.000000000 +0000
@@ -1,3 +1,31 @@
+initramfs-tools (0.120+deb8u1) jessie; urgency=medium
+
+  [ Ben Hutchings ]
+  * [c367d7d] scripts/functions: Use shell to create stamp file instead of
+    'touch' (Closes: #783291)
+  * [d22b95b] update-initramfs: Run 'sync' after writing the initramfs
+    (Closes: #783620)
+  * [c22cefe] hook-functions: Add support for nvme devices with MODULES=dep
+    (Closes: #785147)
+  * [e0b23a1] hook-functions: Add support for LVM/LUKS on mmcblk and nvme
+    devices with MODULES=dep (Closes: #747871, #792366, #810808)
+  * [0e905aa] scripts/functions: Fix fsck display options (Closes: #781239)
+
+  [ Laurent Bigonville ]
+  * [3c4b38a] Support fsck.mode= and fsck.repair= parameters as known by
+    systemd-fsck (Closes: #783410, #792557)
+  * [dcb0f0c] Run new panic scripts just before dropping to a shell
+    (Closes: #602331)
+
+  [ Boris Egorov ]
+  * [2c82cf4] mkinitramfs: fix bashism in script (Closes: #633582)
+
+  [ Andy Whitcroft ]
+  * [97b664e] When adding i8042 also add psmouse as some keyboards are behind
+    the mouse (Closes: #795839)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 Jan 2016 18:23:05 +0000
+
 initramfs-tools (0.120) unstable; urgency=medium
 
   * [23ee5f9] Add '.log' to fsck log output file, and document its existence
diff -Nru initramfs-tools-0.120/debian/initramfs-tools.dirs initramfs-tools-0.120+deb8u1/debian/initramfs-tools.dirs
--- initramfs-tools-0.120/debian/initramfs-tools.dirs	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/debian/initramfs-tools.dirs	2016-01-18 18:07:21.000000000 +0000
@@ -7,6 +7,7 @@
 etc/initramfs-tools/scripts/nfs-bottom
 etc/initramfs-tools/scripts/nfs-premount
 etc/initramfs-tools/scripts/nfs-top
+etc/initramfs-tools/scripts/panic
 etc/initramfs-tools/hooks
 etc/initramfs-tools/conf.d
 usr/share/initramfs-tools/conf.d
diff -Nru initramfs-tools-0.120/hook-functions initramfs-tools-0.120+deb8u1/hook-functions
--- initramfs-tools-0.120/hook-functions	2015-03-01 21:44:34.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/hook-functions	2016-01-18 18:19:39.000000000 +0000
@@ -367,7 +367,9 @@
 		fi
 		# luks or lvm on cciss or ida
 		if [ "${block#cciss}" != "${block}" ] \
-		|| [ "${block#ida}" != "${block}" ]; then
+		|| [ "${block#ida}" != "${block}" ] \
+		|| [ "${block#mmcblk}" != "${block}" ] \
+		|| [ "${block#nvme}" != "${block}" ]; then
 			block="${block%p*}"
 		else
 			block=${block%%[0-9]*}
@@ -434,6 +436,10 @@
 		block=${dev_node#/dev/i2o/}
 		block=${block%%[0-9]*}
 		block='i2o!'$block
+	# nvme device
+	elif [ "${dev_node#/dev/nvme}" != "${dev_node}" ]; then
+		block=${dev_node#/dev/}
+		block=${block%p*}
 	# classical block device
 	else
 		block=${dev_node#/dev/}
@@ -524,7 +530,7 @@
 			modules="$modules btrfs ext2 ext3 ext4 ext4dev "
 			modules="$modules isofs jfs reiserfs udf xfs"
 			modules="$modules nfs nfsv2 nfsv3 nfsv4"
-			modules="$modules af_packet atkbd i8042"
+			modules="$modules af_packet atkbd i8042 psmouse"
 			modules="$modules virtio_pci virtio_mmio"
 
 			# Include all HID drivers unless we're sure they
diff -Nru initramfs-tools-0.120/init initramfs-tools-0.120+deb8u1/init
--- initramfs-tools-0.120/init	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/init	2016-01-18 18:07:21.000000000 +0000
@@ -61,7 +61,7 @@
 export drop_caps=
 export fastboot=n
 export forcefsck=n
-export fsckfix=n
+export fsckfix=
 
 
 # Bring in the main config
@@ -169,15 +169,18 @@
 	BOOTIF=*)
 		BOOTIF=${x#BOOTIF=}
 		;;
-	fastboot)
+	fastboot|fsck.mode=skip)
 		fastboot=y
 		;;
-	forcefsck)
+	forcefsck|fsck.mode=force)
 		forcefsck=y
 		;;
-	fsckfix)
+	fsckfix|fsck.repair=yes)
 		fsckfix=y
 		;;
+	fsck.repair=no)
+		fsckfix=n
+		;;
 	esac
 done
 
diff -Nru initramfs-tools-0.120/mkinitramfs initramfs-tools-0.120+deb8u1/mkinitramfs
--- initramfs-tools-0.120/mkinitramfs	2015-03-01 23:18:25.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/mkinitramfs	2016-01-18 18:07:21.000000000 +0000
@@ -343,7 +343,7 @@
 
 (
 # preserve permissions if root builds the image, see #633582
-[ "$UID" != 0 ] && cpio_owner_root="-R 0:0"
+[ "$(id -ru)" != 0 ] && cpio_owner_root="-R 0:0"
 
 # work around lack of "set -o pipefail" for the following pipe:
 # cd "${DESTDIR}" && find . | cpio --quiet $cpio_owner_root -o -H newc | gzip >>"${outfile}" || exit 1
diff -Nru initramfs-tools-0.120/scripts/functions initramfs-tools-0.120+deb8u1/scripts/functions
--- initramfs-tools-0.120/scripts/functions	2015-04-13 00:56:58.000000000 +0100
+++ initramfs-tools-0.120+deb8u1/scripts/functions	2016-01-18 18:19:43.000000000 +0000
@@ -53,6 +53,9 @@
 	modprobe -v uhci-hcd || true
 	modprobe -v ohci-hcd || true
 	modprobe -v usbhid || true
+
+	run_scripts /scripts/panic
+
 	REASON="$@" PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
 }
 
@@ -358,17 +361,22 @@
 		force=""
 	fi
 
-	if [ "$fsckfix" = yes ]
+	if [ "$fsckfix" = "y" ]
 	then
 		fix="-y"
+	elif [ "$fsckfix" = "n" ]
+	then
+		fix="-n"
 	else
 		fix="-a"
 	fi
 
-	# spinner="-C" -- only if on an interactive terminal
 	spinner=""
+	if [ -z "${debug}" ]; then
+		spinner="-C"
+	fi
 
-	if [ "$VERBOSE" = no ]
+	if [ "${quiet}" = n ]
 	then
 		log_begin_msg "Will now check $NAME file system"
 		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -V -t $TYPE $DEV
@@ -376,7 +384,7 @@
 		log_end_msg
 	else
 		log_begin_msg "Checking $NAME file system"
-		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -t $TYPE $DEV
+		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -T -t $TYPE $DEV
 		FSCKCODE=$?
 		log_end_msg
 	fi
@@ -398,7 +406,7 @@
 		log_warning_msg "File system check failed but did not detect errors"
 		sleep 5
 	else
-		touch $FSCK_STAMPFILE
+		> $FSCK_STAMPFILE
 	fi
 	return 0
 }
diff -Nru initramfs-tools-0.120/update-initramfs initramfs-tools-0.120+deb8u1/update-initramfs
--- initramfs-tools-0.120/update-initramfs	2015-03-01 21:05:52.000000000 +0000
+++ initramfs-tools-0.120+deb8u1/update-initramfs	2016-01-18 18:07:21.000000000 +0000
@@ -172,6 +172,8 @@
 	if mkinitramfs ${OPTS} "${initramfs}.new" "${version}"; then
 		mv -f "${initramfs}.new" "${initramfs}"
 		set_sha1
+		# Guard against an unclean shutdown
+		sync
 	else
 		mkinitramfs_return="$?"
 		remove_initramfs_bak

--- End Message ---

--- Begin Message ---

To: 784679-done@bugs.debian.org, 784915-done@bugs.debian.org, 785047-done@bugs.debian.org, 785053-done@bugs.debian.org, 796947-done@bugs.debian.org, 797769-done@bugs.debian.org, 797906-done@bugs.debian.org, 798404-done@bugs.debian.org, 798949-done@bugs.debian.org, 801551-done@bugs.debian.org, 803199-done@bugs.debian.org, 804385-done@bugs.debian.org, 807969-done@bugs.debian.org, 810882-done@bugs.debian.org, 811024-done@bugs.debian.org, 811395-done@bugs.debian.org, 811425-done@bugs.debian.org, 812362-done@bugs.debian.org, 812500-done@bugs.debian.org, 812961-done@bugs.debian.org, 812990-done@bugs.debian.org, 813004-done@bugs.debian.org, 813071-done@bugs.debian.org, 813622-done@bugs.debian.org, 813645-done@bugs.debian.org, 814266-done@bugs.debian.org, 814269-done@bugs.debian.org, 814442-done@bugs.debian.org, 814651-done@bugs.debian.org, 815356-done@bugs.debian.org, 815469-done@bugs.debian.org, 815517-done@bugs.debian.org, 815520-done@bugs.debian.org, 815561-done@bugs.debian.org, 815598-done@bugs.debian.org, 815730-done@bugs.debian.org, 815788-done@bugs.debian.org, 816023-done@bugs.debian.org, 816033-done@bugs.debian.org, 816198-done@bugs.debian.org, 816243-done@bugs.debian.org, 816686-done@bugs.debian.org, 816697-done@bugs.debian.org, 816891-done@bugs.debian.org, 817015-done@bugs.debian.org, 817897-done@bugs.debian.org, 817970-done@bugs.debian.org, 817992-done@bugs.debian.org, 818006-done@bugs.debian.org, 818150-done@bugs.debian.org, 818532-done@bugs.debian.org, 818615-done@bugs.debian.org, 818620-done@bugs.debian.org, 818672-done@bugs.debian.org, 818679-done@bugs.debian.org, 818689-done@bugs.debian.org, 818801-done@bugs.debian.org, 819000-done@bugs.debian.org, 819031-done@bugs.debian.org, 819119-done@bugs.debian.org, 819201-done@bugs.debian.org, 819227-done@bugs.debian.org, 819243-done@bugs.debian.org, 819292-done@bugs.debian.org, 819326-done@bugs.debian.org, 819409-done@bugs.debian.org

Subject: Fix included in stable

From: "Adam D. Barratt" <adam@adam-barratt.org.uk>

Date: Sat, 02 Apr 2016 14:20:04 +0100

Message-id: <1459603204.2441.216.camel@adam-barratt.org.uk>
Version: 8.4

Hi,

The packages referenced by these bugs were included in today's stable
point release.

Regards,

Adam
--- End Message ---

Reply to:

Prev by Date: Bug#811395: marked as done (jessie-pu: package ardour/1:2.8.16+git20131003-4)
Next by Date: Bug#812500: marked as done (jessie-pu/nmu: package user-mode-linux/3.16-1um-0.1+b2)
Previous by thread: Bug#811395: marked as done (jessie-pu: package ardour/1:2.8.16+git20131003-4)
Next by thread: Bug#812500: marked as done (jessie-pu/nmu: package user-mode-linux/3.16-1um-0.1+b2)
Index(es):
- Date
- Thread