Use mkisofs for the s390 live-iso template
Related: rhbz#1746424
This commit is contained in:
		
							parent
							
								
									07e373ad07
								
							
						
					
					
						commit
						554f109122
					
				| @ -21,9 +21,9 @@ from pylorax.sysutils import joinpaths | |||||||
| 
 | 
 | ||||||
| # Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3 | # Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3 | ||||||
| if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: | if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: | ||||||
|     isoargs = "-iso-level 3" |     udfargs = "-allow-limited-size" | ||||||
| else: | else: | ||||||
|     isoargs = "" |     udfargs = "" | ||||||
| %> | %> | ||||||
| 
 | 
 | ||||||
| mkdir ${LIVEDIR} | mkdir ${LIVEDIR} | ||||||
| @ -80,10 +80,10 @@ runcmd mk-s390-cdboot -i ${outroot}/${KERNELDIR}/kernel.img \ | |||||||
|                       -o ${outroot}/${BOOTDIR}/cdboot.img |                       -o ${outroot}/${BOOTDIR}/cdboot.img | ||||||
| 
 | 
 | ||||||
| ## make boot.iso | ## make boot.iso | ||||||
| runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso \ | runcmd mkisofs -o ${outroot}/images/boot.iso \ | ||||||
|        -b ${BOOTDIR}/cdboot.img -c ${BOOTDIR}/boot.cat \ |        -b ${BOOTDIR}/cdboot.img -c ${BOOTDIR}/boot.cat \ | ||||||
|        -boot-load-size 4 -no-emul-boot \ |        -boot-load-size 4 -no-emul-boot \ | ||||||
|        -R -J -V '${isolabel}' -graft-points \ |        -R -J -V '${isolabel}' ${udfargs} -graft-points \ | ||||||
|        ${BOOTDIR}=${outroot}/${BOOTDIR} \ |        ${BOOTDIR}=${outroot}/${BOOTDIR} \ | ||||||
|        ${LIVEDIR}=${outroot}/${LIVEDIR} \ |        ${LIVEDIR}=${outroot}/${LIVEDIR} \ | ||||||
|        ${filegraft} |        ${filegraft} | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user