Automatic commit of package [lorax] release [21.34-1].

This package will not exist soon. Don't bother trying to install it.

(cherry picked from commit 52171ecf23)

lorax.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        21.31
+Version:        21.34
 Release:        1%{?dist}
 Summary:        Tool for creating the anaconda install images
 
@@ -39,8 +39,6 @@ Requires:       dracut >= 030
 
 %if 0%{?fedora}
 # Fedora specific deps
-Requires:       fedup-dracut
-Requires:       fedup-dracut-plymouth
 %ifarch x86_64
 Requires: hfsplus-tools
 %endif
@@ -101,6 +99,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Oct 30 2015 Brian C. Lane <bcl@redhat.com> 21.34-1
+- drop fedup-dracut and friends (wwoods@redhat.com)
+
+* Fri Dec 12 2014 Brian C. Lane <bcl@redhat.com> 21.33-1
+- Actually make boot.iso on aarch64. (pjones@redhat.com)
+
+* Fri Dec 05 2014 Brian C. Lane <bcl@redhat.com> 21.32-1
+- aarch64 no longer needs explicit console setting (#1170412) (bcl@redhat.com)
+
 * Wed Dec 03 2014 Brian C. Lane <bcl@redhat.com> 21.31-1
 - Drop 32 bit for loop from ppc64 grub2 config (#1169878) (bcl@redhat.com)
 - gschemas: Fix typo button_laytout -> button_layout (walters@verbum.org)

rel-eng/packages/lorax

@@ -1 +1 @@
-21.31-1 ./
+21.34-1 ./

share/aarch64.tmpl

@@ -47,3 +47,12 @@ mkdir ${KERNELDIR}
     %endif
 %endfor
 
+%if exists("boot/efi/EFI/*/grubaa64.efi"):
+## make boot.iso
+runcmd mkisofs -o ${outroot}/images/boot.iso \
+       ${efiargs} -R -J -V '${isolabel}' -T -graft-points \
+       ${KERNELDIR}=${outroot}/${KERNELDIR} \
+       ${LIVEDIR}=${outroot}/${LIVEDIR} \
+       ${efigraft} ${imggraft}
+treeinfo images-${basearch} boot.iso images/boot.iso
+%endif

share/config_files/aarch64/grub2-efi.cfg

@@ -14,10 +14,6 @@ function load_video {
   fi
 }
 
-serial --speed=115200
-terminal_input serial console
-terminal_output serial console
-
 load_video
 set gfxpayload=keep
 insmod gzio
@@ -31,11 +27,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
-	linux @KERNELPATH@ @ROOT@ ro console=ttyS0,115200n8
+	linux @KERNELPATH@ @ROOT@ ro
 	initrd @INITRDPATH@
 }
 menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
-	linux @KERNELPATH@ @ROOT@ rd.live.check console=ttyS0,115200n8
+	linux @KERNELPATH@ @ROOT@ rd.live.check
 	initrd @INITRDPATH@
 }
 submenu 'Troubleshooting -->' {
@@ -44,7 +40,7 @@ submenu 'Troubleshooting -->' {
 		initrd @INITRDPATH@
 	}
 	menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
-		linux @KERNELPATH@ @ROOT@ rescue console=ttyS0,115200n8
+		linux @KERNELPATH@ @ROOT@ rescue
 		initrd @INITRDPATH@
 	}
 }

share/runtime-install.tmpl

@@ -57,11 +57,8 @@ installpkg plymouth
 ## extra dracut modules
 installpkg anaconda-dracut dracut-network dracut-config-generic
 
-## fedup-dracut handles upgrades
-installpkg fedup-dracut fedup-dracut-plymouth
-## install other fedup scripts, if there are any. It's OK if there aren't.
-log "Looking for extra fedup-dracut packages..."
--installpkg *-fedup-dracut
+## rescue needs this
+installpkg cryptsetup
 
 ## rpcbind or portmap needed by dracut nfs module
 installpkg rpcbind