From f233caeab8fcb5067c6dca742b0031bdbfc47a4a Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 13 Aug 2014 17:20:41 -0400 Subject: [PATCH] * live-build/ubuntu-touch/hooks/01-setup_user.chroot: - Don't modify PAM files directly, we'll let ubuntu-touch-session do that for us the proper way. (LP: #1348637) --- debian/changelog | 8 ++++++++ live-build/ubuntu-touch/hooks/01-setup_user.chroot | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6193cf36..ce06850d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.240) utopic; urgency=medium + + * live-build/ubuntu-touch/hooks/01-setup_user.chroot: + - Don't modify PAM files directly, we'll let ubuntu-touch-session + do that for us the proper way. (LP: #1348637) + + -- Michael Terry Wed, 13 Aug 2014 16:37:17 -0400 + livecd-rootfs (2.239) utopic; urgency=medium * Revert part of the last change to ship the systemd hook as .chroot diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot index d2b46acb..03ebce5e 100755 --- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot @@ -17,10 +17,6 @@ sed -i 's/^group:.*compat/\0 extrausers/' /etc/nsswitch.conf sed -i 's/^passwd:.*compat/\0 extrausers/' /etc/nsswitch.conf sed -i 's/^shadow:.*compat/\0 extrausers/' /etc/nsswitch.conf -# Allow using pam_extrausers, with relatively weak passwords (no obscure keyword, and with minlen=4) -sed -i '/Primary/a password [success=2 default=ignore] pam_extrausers.so minlen=4 sha512' /etc/pam.d/common-password -sed -i '/Primary/a auth [success=2 authinfo_unavail=ignore default=1] pam_extrausers.so nullok' /etc/pam.d/common-auth - # Move user from /etc to extrausers location grep "^$USER" /etc/group >> /var/lib/extrausers/group grep "^$USER" /etc/passwd >> /var/lib/extrausers/passwd