diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-06-07 11:48:37 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-15 17:56:25 +0100 |
| commit | 6c13d5d8d04b83498ef522abe1c3b595005d60cd (patch) | |
| tree | 04e3ef62997ac4da48b50e0a440166dc311d277b /meta/recipes-connectivity/openssh | |
| parent | 897971dc735a06083d628fce63703189155be782 (diff) | |
| download | poky-6c13d5d8d04b83498ef522abe1c3b595005d60cd.tar.gz | |
openssh: minor indent cleanup for sshd init script
The openssh sshd init script contains a mix of indent styles, mostly
inherited from the Debian script from which it is derived. Leave the
indent from Debian as-is, but for lines which are OE specific (e.g.
where Debian's log_daemon_msg helper has been replaced with echo)
make the indent consistent with surrounding lines.
(From OE-Core rev: 68fb7d3b06887e0db3eef0ab231ced37cfa4894c)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/init | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init index 34ba0f8460..8887e3af13 100644 --- a/meta/recipes-connectivity/openssh/openssh/init +++ b/meta/recipes-connectivity/openssh/openssh/init | |||
| @@ -36,7 +36,7 @@ check_privsep_dir() { | |||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | check_config() { | 38 | check_config() { |
| 39 | /usr/sbin/sshd -t $SSHD_OPTS || exit 1 | 39 | /usr/sbin/sshd $SSHD_OPTS -t || exit 1 |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | 42 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" |
| @@ -48,19 +48,19 @@ case "$1" in | |||
| 48 | @LIBEXECDIR@/sshd_check_keys | 48 | @LIBEXECDIR@/sshd_check_keys |
| 49 | check_privsep_dir | 49 | check_privsep_dir |
| 50 | start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS | 50 | start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS |
| 51 | echo "done." | 51 | echo "done." |
| 52 | ;; | 52 | ;; |
| 53 | stop) | 53 | stop) |
| 54 | echo -n "Stopping OpenBSD Secure Shell server: sshd" | 54 | echo -n "Stopping OpenBSD Secure Shell server: sshd" |
| 55 | start-stop-daemon -K -p $PIDFILE -x /usr/sbin/sshd | 55 | start-stop-daemon -K -p $PIDFILE -x /usr/sbin/sshd |
| 56 | echo "." | 56 | echo "." |
| 57 | ;; | 57 | ;; |
| 58 | 58 | ||
| 59 | reload|force-reload) | 59 | reload|force-reload) |
| 60 | check_for_no_start | 60 | check_for_no_start |
| 61 | @LIBEXECDIR@/sshd_check_keys | 61 | @LIBEXECDIR@/sshd_check_keys |
| 62 | check_config | 62 | check_config |
| 63 | echo -n "Reloading OpenBSD Secure Shell server's configuration" | 63 | echo -n "Reloading OpenBSD Secure Shell server's configuration" |
| 64 | start-stop-daemon -K -p $PIDFILE -s 1 -x /usr/sbin/sshd | 64 | start-stop-daemon -K -p $PIDFILE -s 1 -x /usr/sbin/sshd |
| 65 | echo "." | 65 | echo "." |
| 66 | ;; | 66 | ;; |
| @@ -68,7 +68,7 @@ case "$1" in | |||
| 68 | restart) | 68 | restart) |
| 69 | @LIBEXECDIR@/sshd_check_keys | 69 | @LIBEXECDIR@/sshd_check_keys |
| 70 | check_config | 70 | check_config |
| 71 | echo -n "Restarting OpenBSD Secure Shell server: sshd" | 71 | echo -n "Restarting OpenBSD Secure Shell server: sshd" |
| 72 | start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/sbin/sshd | 72 | start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/sbin/sshd |
| 73 | check_for_no_start | 73 | check_for_no_start |
| 74 | check_privsep_dir | 74 | check_privsep_dir |
