mirror of
				https://git.launchpad.net/livecd-rootfs
				synced 2025-11-04 10:54:07 +00:00 
			
		
		
		
	Import patches-unapplied version 2.349 to ubuntu/wily-proposed
Imported using git-ubuntu import.
Changelog parent: 8c606962fab21203597e115e446a5b035d0798cb
New changelog entries:
  * do not hardcode installation of grub-pc for amd64 in snappy images,
    instead install the right grub set for secureboot there
			
			
This commit is contained in:
		
							parent
							
								
									8c606962fa
								
							
						
					
					
						commit
						5edb230a21
					
				
							
								
								
									
										7
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,10 @@
 | 
			
		||||
livecd-rootfs (2.349) wily; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * do not hardcode installation of grub-pc for amd64 in snappy images,
 | 
			
		||||
    instead install the right grub set for secureboot there
 | 
			
		||||
 | 
			
		||||
 -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 17:47:03 +0200
 | 
			
		||||
 | 
			
		||||
livecd-rootfs (2.348) wily; urgency=medium
 | 
			
		||||
 | 
			
		||||
  * limit grub-install diversion on snappy images to x86 architectures
 | 
			
		||||
 | 
			
		||||
@ -402,9 +402,14 @@ case $PROJECT in
 | 
			
		||||
			# generic kernel etc
 | 
			
		||||
			KERNEL_FLAVOURS=generic
 | 
			
		||||
			case $ARCH in
 | 
			
		||||
				i386|amd64)
 | 
			
		||||
				i386)
 | 
			
		||||
					add_package install grub-pc
 | 
			
		||||
					;;
 | 
			
		||||
				amd64)
 | 
			
		||||
					add_package install grub-pc-bin
 | 
			
		||||
					add_package install grub-efi-amd64-signed
 | 
			
		||||
					add_package install shim-signed
 | 
			
		||||
					;;
 | 
			
		||||
				armhf)
 | 
			
		||||
					add_package install flash-kernel u-boot-tools
 | 
			
		||||
					;;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user