mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 10:54:07 +00:00 
			
		
		
		
	Import patches-unapplied version 2.240 to ubuntu/utopic-proposed
Imported using git-ubuntu import.
Changelog parent: c66e2a7c05ab819749e5b8349fd813d16e501ec0
New changelog entries:
  * 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)
			
			
This commit is contained in:
		
							parent
							
								
									c66e2a7c05
								
							
						
					
					
						commit
						eb694e09bc
					
				
							
								
								
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -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 <mterry@ubuntu.com>  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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user