MAAS

Merge lp:~smoser/maas/fix-login-block-reboot into lp:maas/trunk

  1. fix-login-block-reboot
  2. Merge into trunk
Proposed by Scott Moser on 2012-10-10
Status: Merged
Approved by: Andres Rodriguez on 2012-10-10
Approved revision: 1252
Merged at revision: 1252
Proposed branch: lp:~smoser/maas/fix-login-block-reboot
Merge into: lp:maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
contrib/preseeds_v2/enlist_userdata (+1/-1)
To merge this branch: bzr merge lp:~smoser/maas/fix-login-block-reboot
Reviewer Review Type Date Requested Status
Andres Rodriguez 2012-10-10 Approve on 2012-10-10
Review via email: mp+129035@code.launchpad.net

Commit Message

fix inconsistent filename for blocking reboot.

With the previous commit, a login to the console would not cause system to disable reboot.

Description of the Change

Fix inconsistent filename for blocking reboot.

To post a comment you must log in.
Andres Rodriguez (andreserl) 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 'contrib/preseeds_v2/enlist_userdata'
2--- contrib/preseeds_v2/enlist_userdata 2012-10-10 14:03:55 +0000
3+++ contrib/preseeds_v2/enlist_userdata 2012-10-10 20:22:22 +0000
4@@ -197,7 +197,7 @@
5 pass="ubuntu"
6
7 echo "$user:$pass" | chpasswd
8- bfile="/tmp/block-reboot"
9+ bfile="/tmp/block-poweroff"
10 { echo "#!/bin/sh"; echo "touch $bfile"; } > /etc/profile.d/A01-block.sh
11 chmod 755 /etc/profile.d/A01-block.sh
12 echo