[Buildroot] [PATCH v2] package/dropbear: Fix symlink only if pointing to the right directory

Paul Cercueil paul at crapouillou.net
Tue Jul 28 08:21:31 UTC 2015


This commit ensures that the /etc/dropbear symlink won't be removed if
it points elsewhere than /var/run/dropbear.

Signed-off-by: Paul Cercueil <paul at crapouillou.net>
---

v2: Use "readlink -f", as the symbolic link might be pointing to a relative
path and not an absolute path.

 package/dropbear/S50dropbear      | 6 ++++--
 package/dropbear/dropbear.service | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear
index af50ccf..f551677 100644
--- a/package/dropbear/S50dropbear
+++ b/package/dropbear/S50dropbear
@@ -12,12 +12,14 @@ start() {
 	echo -n "Starting dropbear sshd: "
 	umask 077
 
-	# If /etc/dropbear is not a directory, and
+	# If /etc/dropbear is a symlink to /var/run/dropbear, and
 	#   - the filesystem is RO (i.e. we can not rm the symlink),
 	#     create the directory pointed to by the symlink.
 	#   - the filesystem is RW (i.e. we can rm the symlink),
 	#     replace the symlink with an actual directory
-	if ! [ -d /etc/dropbear ]; then
+	if [ -L /etc/dropbear \
+		-a "$(readlink -f /etc/dropbear)" = "/var/run/dropbear" ]
+	then
 		if rm -f /etc/dropbear; then
 			mkdir -p /etc/dropbear
 		else
diff --git a/package/dropbear/dropbear.service b/package/dropbear/dropbear.service
index 0e2cf54..f1d4d5d 100644
--- a/package/dropbear/dropbear.service
+++ b/package/dropbear/dropbear.service
@@ -3,13 +3,13 @@ Description=Dropbear SSH daemon
 After=syslog.target network.target auditd.service
 
 [Service]
-# If /etc/dropbear is not a directory, and
+# If /etc/dropbear is a symlink to /var/run/dropbear, and
 #   - the filesystem is RO (i.e. we can not rm the symlink),
 #     create the directory pointed to by the symlink.
 #   - the filesystem is RW (i.e. we can rm the symlink),
 #     replace the symlink with an actual directory
 ExecStartPre=/bin/sh -c '\
-if ! [ -d /etc/dropbear ]; then \
+if [ -L /etc/dropbear -a "$(readlink -f /etc/dropbear)" = "/var/run/dropbear" ]; then \
     if rm -f /etc/dropbear; then \
         mkdir -p /etc/dropbear; \
     else \
-- 
2.4.6



More information about the buildroot mailing list