Skip to content

Commit 0659628

Browse files
committed
Fix comments
1 parent ff9b61e commit 0659628

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

rules/openssh.dep

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
SPATH := $($(OPENSSH_SERVER)_SRC_PATH)
32
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/openssh.mk rules/openssh.dep
43
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
@@ -7,4 +6,3 @@ DEP_FILES += $(shell git ls-files $(SPATH))
76
$(OPENSSH_SERVER)_CACHE_MODE := GIT_CONTENT_SHA
87
$(OPENSSH_SERVER)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
98
$(OPENSSH_SERVER)_DEP_FILES := $(DEP_FILES)
10-

src/openssh/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1010
rm -rf ./openssh-server
1111
git clone https://salsa.debian.org/ssh-team/openssh.git openssh-server
1212
pushd ./openssh-server
13-
git checkout -b openssh-src -f 6d9ca74c48d9911342c6ca5aaac8a25974fa2619
13+
git checkout -b openssh-src -f debian/1\%$(OPENSSH_VERSION)
1414

1515
# Apply patch series
1616
stg init

src/openssh/patch/0001-Put-style-as-line-number-to-ssh-session-environment-.patch

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
From 839f98d579e3a22b6ca075fd026eee55bdb2ef25 Mon Sep 17 00:00:00 2001
2-
From: Blueve <672454911@qq.com>
1+
From 6e8cca780dab4680292192058b90a4a28f35d4ab Mon Sep 17 00:00:00 2001
2+
From: Blueve <blueve@users.noreply.github.com>
33
Date: Mon, 26 Oct 2020 06:44:59 +0000
4-
Subject: [PATCH] Put style as line number to ssh session environment variable
4+
Subject: [PATCH 1/1] Put style as line number to ssh session environment
5+
variable
56

7+
By default, the content between : and @ will be trimmed by sshd before it do
8+
authentication and the trimmed string will be dropped silently. To use this
9+
segment as line number for reverse SSH feature, we need to modify the source
10+
code of OpenSSH and put this segment to a environment variable
11+
SSH_TARGET_CONSOLE_LINE, then we can insert a short script into /etc/bash.bashrc
12+
and run command consutil connect $SSH_TARGET_CONSOLE_LINE to enter the
13+
management session automatically after user login.
614
---
715
session.c | 5 +++++
816
1 file changed, 5 insertions(+)

0 commit comments

Comments
 (0)