rpms/anaconda
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Mar 24 2009 David Cantrell <dcantrell@redhat.com> - 11.5.0.37-1

Browse Source 
- Start with a basic /etc/hosts file (#491634) (dcantrell)
- Do not flag every existing partition for resize (#491803) (dcantrell)
- Remove unused noformatCB() function. (dcantrell)
- Remove unnecessary istruefalse() function. (dcantrell)
- Build new _isys.so for updates.img if needed. (dcantrell)
- Get the UUID of each md array we create. (#491796) (dlehman)
- Call udev_settle after committing changes to a disk (#491529) (hdegoede)
- Be a little bit smarter about allocating space to grow parts. (#491761)
  (dlehman)
- Check that partition is on the disk before trying to remove it. (#491997)
  (dlehman)
- Work around a bug in mdadm incremental assembly. (dlehman)
- Use the same units (MB) for extent size that we do for everything else.
  (dlehman)
- Put line breaks in between crypttab entries. (#491938) (dlehman)
- Register the NoDevFS class. (clumens)
- fslabels -> labels. (clumens)
- NFSDevice does not take exists= as a parameter. (clumens)
- Override _setDevice and _getDevice in NFS. (clumens)
- Move resolveDevice into the DeviceTree class. (clumens)
- Move most of the parseFSTab logic into its own function. (clumens)
- We don't even use partedUtils in this module. (clumens)
- PReP formats can never be active. (#491865) (dlehman)
- Move protectedPartition setup into storageInitialize (#491781). (clumens)
- Use the mount and unmount methods on OpticalDevice.format now. (clumens)
- Add a format for ISO9660 filesystems. (clumens)
- getDeviceByName does not expect the CD device to start with "/dev/"
  (#491768). (clumens)
- Write the same arch to .discinfo as iutil.getArch() gives us (#490977).
  (clumens)
- Don't remove partitions twice. (jgranado)
This commit is contained in:
David Cantrell 2009-03-25 02:03:34 +00:00
parent 64defcc9f6
commit 39fe2ca214
1 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
anaconda-efi.patch
View File

@ -1,7 +1,6 @@
diff --git a/bootdisk/i386/grub.conf b/bootdisk/i386/grub.conf diff -up anaconda-11.5.0.37/bootdisk/i386/grub.conf.orig anaconda-11.5.0.37/bootdisk/i386/grub.conf
index 156f98d..6e94d05 100644 --- anaconda-11.5.0.37/bootdisk/i386/grub.conf.orig 2009-03-24 15:41:58.000000000 -1000
--- a/bootdisk/i386/grub.conf +++ anaconda-11.5.0.37/bootdisk/i386/grub.conf 2009-03-24 16:02:53.000000000 -1000
+++ b/bootdisk/i386/grub.conf
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
#debug --graphics #debug --graphics
default=0 default=0
@ -14,10 +13,9 @@ index 156f98d..6e94d05 100644
- initrd /EFI/boot/initrd.img - initrd /EFI/boot/initrd.img
+ kernel @KERNELPATH@ + kernel @KERNELPATH@
+ initrd @INITRDPATH@ + initrd @INITRDPATH@
diff --git a/bootdisk/x86_64/grub.conf b/bootdisk/x86_64/grub.conf diff -up anaconda-11.5.0.37/bootdisk/x86_64/grub.conf.orig anaconda-11.5.0.37/bootdisk/x86_64/grub.conf
index 156f98d..6e94d05 100644 --- anaconda-11.5.0.37/bootdisk/x86_64/grub.conf.orig 2009-03-24 15:41:58.000000000 -1000
--- a/bootdisk/x86_64/grub.conf +++ anaconda-11.5.0.37/bootdisk/x86_64/grub.conf 2009-03-24 16:02:53.000000000 -1000
+++ b/bootdisk/x86_64/grub.conf
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
#debug --graphics #debug --graphics
default=0 default=0
@ -30,10 +28,9 @@ index 156f98d..6e94d05 100644
- initrd /EFI/boot/initrd.img - initrd /EFI/boot/initrd.img
+ kernel @KERNELPATH@ + kernel @KERNELPATH@
+ initrd @INITRDPATH@ + initrd @INITRDPATH@
diff --git a/scripts/buildinstall b/scripts/buildinstall diff -up anaconda-11.5.0.37/scripts/buildinstall.orig anaconda-11.5.0.37/scripts/buildinstall
index ab8d2df..f098537 100755 --- anaconda-11.5.0.37/scripts/buildinstall.orig 2009-03-24 15:41:58.000000000 -1000
--- a/scripts/buildinstall +++ anaconda-11.5.0.37/scripts/buildinstall 2009-03-24 16:02:53.000000000 -1000
+++ b/scripts/buildinstall
@@ -219,8 +219,9 @@ echo "Writing .treeinfo file..." @@ -219,8 +219,9 @@ echo "Writing .treeinfo file..."
$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BASEARCH --outfile=$OUTPUT/.treeinfo
@ -45,23 +42,10 @@ index ab8d2df..f098537 100755
+$MKIMGCMD || die "image creation failed" +$MKIMGCMD || die "image creation failed"
echo "Writing .discinfo file" echo "Writing .discinfo file"
$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo $MK_STAMP --releasestr="$RELEASESTR" --arch=$BASEARCH --discNum="ALL" --outfile=$OUTPUT/.discinfo
diff --git a/scripts/mk-images b/scripts/mk-images diff -up anaconda-11.5.0.37/scripts/mk-images.efi.orig anaconda-11.5.0.37/scripts/mk-images.efi
index d4cac46..d69301e 100755 --- anaconda-11.5.0.37/scripts/mk-images.efi.orig 2009-03-24 15:41:58.000000000 -1000
--- a/scripts/mk-images +++ anaconda-11.5.0.37/scripts/mk-images.efi 2009-03-24 16:02:53.000000000 -1000
+++ b/scripts/mk-images
@@ -863,6 +863,7 @@ doPostImages() {
# this gets overloaded if we're on an EFI-capable arch (... with grub)
makeEfiImages()
{
+ echo "Not on an EFI capable machine; skipping EFI images."
/bin/true
}
diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index 7c25950..3be5594 100644
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -45,6 +45,7 @@ makeefibootdisk() @@ -45,6 +45,7 @@ makeefibootdisk()
#makeefibootimage required for EFI bootloader dosfs image #makeefibootimage required for EFI bootloader dosfs image
@ -114,7 +98,9 @@ index 7c25950..3be5594 100644
# used to populate the efi boot image # used to populate the efi boot image
prepareEfiTree() { prepareEfiTree() {
- mkdir -p $MBD_BOOTTREE_TMP/EFI/boot - mkdir -p $MBD_BOOTTREE_TMP/EFI/boot
- + echo "in prepareEfiTree"
+ mkdir -p $MBD_BOOTTREE_TMP/EFI/BOOT
- cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/ - cp -a $BOOTDISKDIR/* $MBD_BOOTTREE_TMP/EFI/boot/
- [ -n "$INITRDFILE" ] && cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img - [ -n "$INITRDFILE" ] && cp $INITRDFILE $MBD_BOOTTREE_TMP/EFI/boot/initrd.img
- [ -n "$KERNELFILE" ] && cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz - [ -n "$KERNELFILE" ] && cp $KERNELFILE $MBD_BOOTTREE_TMP/EFI/boot/vmlinuz
@ -123,9 +109,6 @@ index 7c25950..3be5594 100644
- sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf - sed -i "s/@VERSION@/$VERSION/g" $MBD_BOOTTREE_TMP/EFI/boot/grub.conf
- -
- yumdownloader -c $yumconf $grubpkg - yumdownloader -c $yumconf $grubpkg
+ echo "in prepareEfiTree"
+ mkdir -p $MBD_BOOTTREE_TMP/EFI/BOOT
+
+ cp -av $BOOTDISKDIR/*.conf $MBD_BOOTTREE_TMP/EFI/BOOT/ + cp -av $BOOTDISKDIR/*.conf $MBD_BOOTTREE_TMP/EFI/BOOT/
+ [ -n "$KERNELFILE" ] && cp -av $KERNELFILE $MBD_BOOTTREE_TMP/EFI/BOOT/vmlinuz + [ -n "$KERNELFILE" ] && cp -av $KERNELFILE $MBD_BOOTTREE_TMP/EFI/BOOT/vmlinuz
+ [ -n "$INITRDFILE" ] && cp -av $INITRDFILE $MBD_BOOTTREE_TMP/EFI/BOOT/initrd.img + [ -n "$INITRDFILE" ] && cp -av $INITRDFILE $MBD_BOOTTREE_TMP/EFI/BOOT/initrd.img
@ -225,10 +208,20 @@ index 7c25950..3be5594 100644
--grubpkg ${grubpkg} --grubpkg ${grubpkg}
local ret=$? local ret=$?
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 diff -up anaconda-11.5.0.37/scripts/mk-images.orig anaconda-11.5.0.37/scripts/mk-images
index fe7a978..22db99c 100644 --- anaconda-11.5.0.37/scripts/mk-images.orig 2009-03-24 15:41:58.000000000 -1000
--- a/scripts/mk-images.x86 +++ anaconda-11.5.0.37/scripts/mk-images 2009-03-24 16:02:53.000000000 -1000
+++ b/scripts/mk-images.x86 @@ -870,6 +870,7 @@ doPostImages() {
# this gets overloaded if we're on an EFI-capable arch (... with grub)
makeEfiImages()
{
+ echo "Not on an EFI capable machine; skipping EFI images."
/bin/true
}
diff -up anaconda-11.5.0.37/scripts/mk-images.x86.orig anaconda-11.5.0.37/scripts/mk-images.x86
--- anaconda-11.5.0.37/scripts/mk-images.x86.orig 2009-03-24 15:41:58.000000000 -1000
+++ anaconda-11.5.0.37/scripts/mk-images.x86 2009-03-24 16:02:53.000000000 -1000
@@ -159,15 +159,16 @@ doPostImages() { @@ -159,15 +159,16 @@ doPostImages() {
if [ -n "$BOOTISO" ]; then if [ -n "$BOOTISO" ]; then
EFIARGS="" EFIARGS=""