mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 02:44:07 +00:00 
			
		
		
		
	Import patches-unapplied version 2.248 to ubuntu/utopic-proposed
Imported using git-ubuntu import.
Changelog parent: 720ff888d355d17f6d3bb0c25cdea3ecd01b827f
New changelog entries:
  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
    resolv.conf for Ubuntu Core. 
  * live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot:
    Configure system-image-cli's client.ini for Ubuntu Core. This can be
    dropped once bug 1373467 is fixed.
			
			
This commit is contained in:
		
							parent
							
								
									720ff888d3
								
							
						
					
					
						commit
						e11f18b965
					
				
							
								
								
									
										10
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,13 @@
 | 
			
		||||
livecd-rootfs (2.248) utopic; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
 | 
			
		||||
    resolv.conf for Ubuntu Core. 
 | 
			
		||||
  * live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot:
 | 
			
		||||
    Configure system-image-cli's client.ini for Ubuntu Core. This can be
 | 
			
		||||
    dropped once bug 1373467 is fixed.
 | 
			
		||||
 | 
			
		||||
 -- James Hunt <james.hunt@ubuntu.com>  Fri, 03 Oct 2014 15:23:47 +0100
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.247) utopic; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early:
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										3
									
								
								live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										3
									
								
								live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,3 @@
 | 
			
		||||
#!/bin/sh -x
 | 
			
		||||
 | 
			
		||||
ln -s /run/resolvconf/resolv.conf /etc/resolv.conf
 | 
			
		||||
							
								
								
									
										7
									
								
								live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										7
									
								
								live-build/ubuntu-core/hooks/07-configure-system-image-client.chroot
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
#!/bin/sh -x
 | 
			
		||||
 | 
			
		||||
# Change default cache partition (until LP: #1373467 is fixed).
 | 
			
		||||
if [ -f /etc/system-image/client.ini ]; then
 | 
			
		||||
	sed -ie 's!cache_partition: /android/cache/recovery!cache_partition: /userdata/cache!g' \
 | 
			
		||||
			/etc/system-image/client.ini
 | 
			
		||||
fi
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user