summaryrefslogtreecommitdiffstats
path: root/debian/patches/0021-Fix-bootstrap-bash.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 06:49:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 06:49:00 +0000
commit93907d0c009d758811b54e7984337477a39f05cf (patch)
treea34881e1b02ccd5281ca58a799877f2d5e80d778 /debian/patches/0021-Fix-bootstrap-bash.patch
parentAdding upstream version 4.6.0. (diff)
downloadcrmsh-93907d0c009d758811b54e7984337477a39f05cf.tar.xz
crmsh-93907d0c009d758811b54e7984337477a39f05cf.zip
Adding debian version 4.6.0-1.debian/4.6.0-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/0021-Fix-bootstrap-bash.patch')
-rw-r--r--debian/patches/0021-Fix-bootstrap-bash.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/0021-Fix-bootstrap-bash.patch b/debian/patches/0021-Fix-bootstrap-bash.patch
new file mode 100644
index 0000000..943aeb9
--- /dev/null
+++ b/debian/patches/0021-Fix-bootstrap-bash.patch
@@ -0,0 +1,25 @@
+Description: Fix bootstrap with dash
+Author: Valentin Vidic <vvidic@debian.org>
+Last-Update: 2024-02-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/crmsh/ssh_key.py
++++ b/crmsh/ssh_key.py
+@@ -235,7 +235,7 @@
+ ssh-keygen -t rsa -f ~/.ssh/id_rsa -q -C "Cluster internal on $(hostname)" -N '' <> /dev/null
+ echo 'GENERATED=1'
+ fi
+-for file in ~/.ssh/id_{{{pattern}}}; do
++for file in {pattern}; do
+ if [ -f "$file" ]; then
+ if ! [ -f "$file".pub ]; then
+ ssh-keygen -y -f "$file" > "$file".pub
+@@ -245,7 +245,7 @@
+ done
+ '''.format(
+ condition=' -o '.join([f'-f ~/.ssh/id_{t}' for t in self.KNOWN_KEY_TYPES]),
+- pattern=','.join(self.KNOWN_KEY_TYPES),
++ pattern=' '.join([f'~/.ssh/id_{t}' for t in self.KNOWN_KEY_TYPES]),
+ )
+ result = self.cluster_shell.subprocess_run_without_input(
+ host, user,