mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 02:44:07 +00:00 
			
		
		
		
	Import patches-unapplied version 2.252 to ubuntu/utopic-proposed
Imported using git-ubuntu import.
Changelog parent: c788aa8b1c8ea89c6d3dcec2b5b7b1d17993fc0a
New changelog entries:
  [ James Hunt ]
  * Convert resolvconf hook from a chroot hook to a binary hook since lb
    overwrites /etc/resolv.conf after the chroot hooks have run.  * 
  * create /etc/hosts for ubuntu-core:system-image
			
			
This commit is contained in:
		
							parent
							
								
									c788aa8b1c
								
							
						
					
					
						commit
						a40ec94d24
					
				
							
								
								
									
										14
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,17 @@
 | 
			
		||||
livecd-rootfs (2.252) utopic; urgency=low
 | 
			
		||||
 | 
			
		||||
  [ James Hunt ]
 | 
			
		||||
  * Convert resolvconf hook from a chroot hook to a binary hook since lb
 | 
			
		||||
    overwrites /etc/resolv.conf after the chroot hooks have run.  * 
 | 
			
		||||
 | 
			
		||||
 -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Oct 2014 13:20:40 +0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.251) utopic; urgency=low
 | 
			
		||||
 | 
			
		||||
  * create /etc/hosts for ubuntu-core:system-image
 | 
			
		||||
 | 
			
		||||
 -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Oct 2014 09:24:39 +0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.250) utopic; urgency=low
 | 
			
		||||
 | 
			
		||||
  * build system-image without recommends
 | 
			
		||||
 | 
			
		||||
@ -1,3 +0,0 @@
 | 
			
		||||
#!/bin/sh -x
 | 
			
		||||
 | 
			
		||||
ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf
 | 
			
		||||
							
								
								
									
										7
									
								
								live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										7
									
								
								live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,7 @@
 | 
			
		||||
#!/bin/sh -x
 | 
			
		||||
#---------------------------------------------------------------------
 | 
			
		||||
# this must be run as a binary hook (outside the chroot) since lb
 | 
			
		||||
# massages resolv.conf on finishing the chroot operations.
 | 
			
		||||
#---------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
ln -fs /run/resolvconf/resolv.conf chroot/etc/resolv.conf
 | 
			
		||||
							
								
								
									
										9
									
								
								live-build/ubuntu-core/includes.chroot/etc/hosts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								live-build/ubuntu-core/includes.chroot/etc/hosts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,9 @@
 | 
			
		||||
127.0.0.1	localhost.localdomain	localhost
 | 
			
		||||
::1		localhost6.localdomain6	localhost6
 | 
			
		||||
 | 
			
		||||
# The following lines are desirable for IPv6 capable hosts
 | 
			
		||||
::1     localhost ip6-localhost ip6-loopback
 | 
			
		||||
fe00::0 ip6-localnet
 | 
			
		||||
ff02::1 ip6-allnodes
 | 
			
		||||
ff02::2 ip6-allrouters
 | 
			
		||||
ff02::3 ip6-allhosts
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user