Merge branch 'master' of git+ssh://git.fedoraproject.org/git/hosted/anaconda

5 files changed, 68 insertions, 7 deletions

diff --git a/anaconda.spec b/anaconda.spec
index f798250c8..c026f5f3a 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 11.4.0.66
+Version: 11.4.0.67
 Release: 1
 License: GPLv2+
 Group:   Applications/System
@@ -207,6 +207,37 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 08 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.67-1
+- Set the initial state of the auto-encrypt checkbutton (#441018) (katzj)
+- Don't treat RAID devices as "disks" to avoid lots of odd
+  behavior (#438358) (katzj)
+- Log a message if we disable selinux on upgrade (katzj)
+- Build efiboot.img on x86_64 and i386 . (pjones)
+- When splitting srpms, only link srpms, nothing else. (jkeating)
+- Don't cause the text to flicker between installed packages. (clumens)
+- Don't cause the screen to jump up and down between
+  packages (#441160). (clumens)
+- Fix zooming and centering in the timezone screen (#439832). (clumens)
+- Handle ia64 kernel path (katzj)
+- And add nas to the list (#439255) (katzj)
+- Set parent so that the dialog centers (#441361) (katzj)
+- Don't show the label column (#441352) (katzj)
+- Do string substitution after we've translated (#441053) (katzj)
+- Set domain on glade file so translations show up (#441053) (katzj)
+- fix compression of modules (notting)
+- More build fixing due to translation breakage. (katzj)
+- Add code to create efiboot.img on i386 and x86_64 (pjones)
+- Remove gnome-panel too, it's no longer multilib. (jkeating)
+- Fix raising new NoSuchGroup exception. (clumens)
+- remove debugging print (notting)
+- Support encrypted RAID member devices. (#429600) (dlehman)
+- No longer require Amiga partitions on Pegasos (dwmw2)
+- Don't copy the stage2 image every time or on the way back. (clumens)
+- Make lukscb.get_data("encrypt") always return a valid value. (pjones)
+- Set the scrollbar color so it doesn't surprise me the same way in
+  the future. (pjones)
+- Translation updates.
+
 * Sun Apr 06 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.66-1
 - Another day, another broken translation commit to fix. (katzj)
 - Work around GL crashes in anaconda X by disabling them. (jkeating)
@@ -250,8 +281,6 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
 * Mon Mar 31 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.64-1
 - Fix my tyop (katzj)
 - Fuzzy broken string again (katzj)
-- Merge branch 'master' of git+ssh://git.fedoraproject.org/git/hosted/anaconda (katzj)
-- 2008-03-30  Yulia Poyarkova <ypoyarko)
 
 * Sun Mar 30 2008 Jeremy Katz <katzj@redhat.com> - 11.4.0.63-1
 - Fix broken translations.  Again. (katzj)
diff --git a/isys/isys.py b/isys/isys.py
index 983237ed0..840ebf9a7 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -421,6 +421,10 @@ def driveDict(klassArg):
                 log.info("ignoring st device %s" %(device,))
                 continue
 
+            # we want to ignore md devices as they're not hard disks in our pov
+            if device.startswith("md"):
+                continue
+
             if dev['storage.drive_type'] != 'disk':
                 new[device] = dev
                 continue
diff --git a/iw/autopart_type.py b/iw/autopart_type.py
index fba6432bc..e158d02b1 100644
--- a/iw/autopart_type.py
+++ b/iw/autopart_type.py
@@ -434,6 +434,8 @@ class PartitionTypeWindow(InstallWindow):
         self.review = not self.dispatch.stepInSkipList("partition")
         self.xml.get_widget("reviewButton").set_active(self.review)
 
+        self.xml.get_widget("encryptButton").set_active(self.partitions.autoEncrypt)
+
         active = self.combo.get_active_iter()
         val = self.combo.get_model().get_value(active, 1)
 
diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index d104c0282..c10fe3caf 100755
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -18,8 +18,29 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-#makeefibootdisk required for EFI bootloader dosfs image
-makeefibootdisk() {
+makeefibootdisk()
+{
+    partimg=$1
+    target=$2
+
+    local partsize=$(ls -l $1 | awk '{ print $5 }')
+    local disksize=$((17408 + $partsize + 17408))
+    disksize=$(($disksize + $(($disksize % 512))))
+    local diskimg=$(mktemp /tmp/efidisk.img.XXXXXX)
+    dd if=/dev/zero of=$diskimg count=1 bs=$disksize
+    local loop=$(losetup -v -f $diskimg | awk '{ print $4 }')
+    dmsetup create efiboot$$ --table "0 $(($disksize / 512)) linear $loop 0"
+    parted --script efiboot$$ mklabel gpt unit b mkpart '"EFI System Partition"' fat32 17408 $((17408 + $partsize)) set 1 boot on
+    dd if=$partimg of=/dev/mapper/efiboot$$p1
+    dmsetup remove /dev/mapper/efiboot$$p1
+    dmsetup remove /dev/mapper/efiboot$$
+    losetup -d $loop
+
+    mv -v $diskimg $target
+}
+
+#makeefibootimage required for EFI bootloader dosfs image
+makeefibootimage() {
     MBD_FILENAME=""
     KERNELFILE=""
     INITRDFILE=""
@@ -153,11 +174,15 @@ makeEfiImages() {
 	fi
     	echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/efiboot.img"
 
-	makeefibootdisk \
-	    --imagename efiboot.img \
+	makeefibootimage \
+	    --imagename pxeboot/efiboot.img \
 	    --kernel $TOPDESTPATH/images/pxeboot/vmlinuz \
 	    --initrd $TOPDESTPATH/images/pxeboot/initrd.img \
 	    --grubpkg ${grubpkg}
+	local ret=$?
+	[ $ret -eq 0] || return $ret
+
+	makeefibootdisk $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/images/efidisk.img
 	return $?
     fi
     return 1
diff --git a/upgrade.py b/upgrade.py
index c126ca84d..78a50522f 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -451,6 +451,7 @@ def upgradeMountFilesystems(anaconda):
             ctx = selinux.getfilecon(anaconda.rootPath + "/.autorelabel")[1]
             if not ctx or ctx == "unlabeled":
                 flags.selinux = False
+                log.info("Disabled SELinux for upgrade based on /.autorelabel")
     except Exception, e:
         log.warning("error checking selinux state: %s" %(e,))