Package: dropbear
Version: 2014.65-1
Followup-For: Bug #632656
Package: dropbear
Version: 2014.65-1
Followup-For: Bug #632656
Hi,
I found this bug is not resolved in 2014.65-1.
1. mountpoint is not included initrd image
2. if mountpoint returns true, we don't try mount /dev/pts
2 affects all users while 1. is for those who uses initrd image.
Attached file copy_mountpoint_in_initrd.diff is to address 1,
and file devpts.diff to address 2.
In addition I delayed the reading of scripts/functions until it is really
required.
Regards,
Takeshi Hamasaki
-- System Information:
Debian Release: 7.6
APT prefers stable
APT policy: (990, 'stable'), (650, 'testing'), (600, 'unstable'), (500,
'stable-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14.15 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to ja_JP.UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages dropbear depends on:
ii libc6 2.19-4
ii zlib1g 1:1.2.7.dfsg-13
dropbear recommends no packages.
Versions of packages dropbear suggests:
ii openssh-client 1:6.0p1-4+deb7u2
pn runit <none>
ii udev 208-6
ii xauth 1:1.0.7-1
-- no debconf information
-- System Information:
Debian Release: 7.6
APT prefers stable
APT policy: (990, 'stable'), (650, 'testing'), (600, 'unstable'), (500,
'stable-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.14.15 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to ja_JP.UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages dropbear depends on:
ii libc6 2.19-4
ii zlib1g 1:1.2.7.dfsg-13
dropbear recommends no packages.
Versions of packages dropbear suggests:
ii openssh-client 1:6.0p1-4+deb7u2
pn runit <none>
ii udev 208-6
ii xauth 1:1.0.7-1
-- no debconf information
--- a/usr/share/initramfs-tools/hooks/dropbear 2014-08-12 07:15:40.000000000 +0900
+++ b/usr/share/initramfs-tools/hooks/dropbear 2014-08-22 10:10:17.000000000 +0900
@@ -16,6 +16,9 @@
. "${CONFDIR}/initramfs.conf"
. /usr/share/initramfs-tools/hook-functions
+# init-premount/devpts calls mountpoint
+copy_exec "/bin/mountpoint" "/bin/"
+
# Install dropbear if explicitly enabled, or in case of a cryptroot setup if not explicitly disabled
if [ "${DROPBEAR}" = "y" ] || ( [ "${DROPBEAR}" != "n" ] && [ -r "/etc/crypttab" ] ); then
if [ ! -x "/usr/sbin/dropbear" ]; then
--- a/usr/share/initramfs-tools/scripts/init-premount/devpts 2014-08-12 07:15:40.000000000 +0900
+++ b/usr/share/initramfs-tools/scripts/init-premount/devpts 2014-08-22 12:05:26.000000000 +0900
@@ -13,12 +13,13 @@
;;
esac
-. /scripts/functions
-
grep -E "[[:space:]]+devpts$" /proc/filesystems >/dev/null 2>&1 || exit 0
# If /dev/pts is already mounted, don't re-mount it.
-mountpoint -q /dev/pts || exit 0
+mountpoint -q /dev/pts && exit 0
+
+# we don't need it if /dev/pts is already mounted
+. /scripts/functions
log_begin_msg "Mounting devpts"
