UTAH

Merge lp:~nuclearbob/utah/ssh-permissions-2 into lp:utah

  1. ssh-permissions-2
  2. Merge into dev
Proposed by Max Brustkern
Status: Merged
Approved by: Max Brustkern
Approved revision: 926
Merged at revision: 929
Proposed branch: lp:~nuclearbob/utah/ssh-permissions-2
Merge into: lp:utah
Diff against target: 28 lines (+4/-4)
2 files modified
debian/utah-client.postinst (+2/-2)
debian/utah.postinst (+2/-2)
To merge this branch: bzr merge lp:~nuclearbob/utah/ssh-permissions-2
Reviewer Review Type Date Requested Status
Javier Collado (community) Approve
Review via email: mp+167146@code.launchpad.net

Description of the change

This changes the ssh chmod to not break when the directory is empty. Also, the chmod now uses the SSH_DIR variable.

To post a comment you must log in.
Revision history for this message
Javier Collado (javier.collado) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/utah-client.postinst'
2--- debian/utah-client.postinst 2013-06-03 16:27:13 +0000
3+++ debian/utah-client.postinst 2013-06-03 21:03:40 +0000
4@@ -35,8 +35,8 @@
5 done
6 if [ -d "$SSH_DIR" ]
7 then
8- chmod 600 /var/lib/utah/.ssh/*
9- chmod 700 /var/lib/utah/.ssh
10+ chmod -R 600 "$SSH_DIR"
11+ chmod 700 "$SSH_DIR"
12 fi
13 }
14
15
16=== modified file 'debian/utah.postinst'
17--- debian/utah.postinst 2013-06-03 16:27:13 +0000
18+++ debian/utah.postinst 2013-06-03 21:03:40 +0000
19@@ -79,8 +79,8 @@
20 done
21 if [ -d "$SSH_DIR" ]
22 then
23- chmod 600 /var/lib/utah/.ssh/*
24- chmod 700 /var/lib/utah/.ssh
25+ chmod -R 600 "$SSH_DIR"
26+ chmod 700 "$SSH_DIR"
27 fi
28 }
29

Subscribers

People subscribed via source and target branches