launchpad-reviewers team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging lp:~smoser/maas/fix-login-block-reboot into lp:maas.

Commit message:
fix inconsistent filename for blocking reboot.

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~smoser/maas/fix-login-block-reboot/+merge/129035

Fix inconsistent filename for blocking reboot.
-- 
https://code.launchpad.net/~smoser/maas/fix-login-block-reboot/+merge/129035
Your team MAAS Maintainers is requested to review the proposed merge of lp:~smoser/maas/fix-login-block-reboot into lp:maas.

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2012-10-10 14:03:55 +0000
+++ contrib/preseeds_v2/enlist_userdata	2012-10-10 20:22:22 +0000
@@ -197,7 +197,7 @@
       pass="ubuntu"
 
       echo "$user:$pass" | chpasswd
-      bfile="/tmp/block-reboot"
+      bfile="/tmp/block-poweroff"
       { echo "#!/bin/sh"; echo "touch $bfile"; } > /etc/profile.d/A01-block.sh
       chmod 755 /etc/profile.d/A01-block.sh
       echo