merge final batch of taroon changes for taroon GA.

* s390 z/vm format (actually, left the non-useful part of this out and left
  the if 0 until we have the right fix)
* fix initlabel for s390
* ld_library_path for tty2 shell on lib64 arches

2 files changed, 40 insertions, 8 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index 9c4d6662c..b5aafa4e8 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -261,10 +261,16 @@ static void spawnShell(int flags) {
         
         signal(SIGINT, SIG_DFL);
         signal(SIGTSTP, SIG_DFL);
-        
+
+#if defined(__x86_64__) || defined(__s390x__) || defined(__ppc64__)
+        setenv("LD_LIBRARY_PATH",
+               "/lib64:/usr/lib64:/usr/X11R6/lib64:/usr/kerberos/lib64:/mnt/usr/lib64:"
+               "/mnt/sysimage/lib64:/mnt/sysimage/usr/lib64", 1);
+#else
         setenv("LD_LIBRARY_PATH",
                "/lib:/usr/lib:/usr/X11R6/lib:/mnt/usr/lib:"
                "/mnt/sysimage/lib:/mnt/sysimage/usr/lib", 1);
+#endif
         
         execl("/bin/sh", "-/bin/sh", NULL);
         logMessage("exec of /bin/sh failed: %s", strerror(errno));
diff --git a/partedUtils.py b/partedUtils.py
index f62ef1a69..8fc03b173 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -808,20 +808,46 @@ class DiskSet:
             if isys.driveIsRemovable(drive) and not flags.expert:
                 DiskSet.skippedDisks.append(drive)
                 continue
+            # FIXME: need the right fix for z/VM formatted dasd
+            if 0 and iutil.getArch() == "s390":
+                rc = intf.messageWindow(_("Warning"),
+                        _("The partition table on device %s was unreadable. "
+                          "To create new partitions it must be initialized, "
+                          "causing the loss of ALL DATA on this drive.\n\n"
+                          "This operation will override any previous "
+                          "installation choices about which drives to "
+                          "ignore.\n\n"
+                          "Would you like to initialize this drive, "
+                          "erasing ALL DATA?")
+                                        % (drive,), type = "yesno")
+                if rc == 0:
+                    DiskSet.skippedDisks.append(drive)
+                    continue
+                else:
+                    if (self.dasdFmt(intf, drive)):
+                        DiskSet.skippedDisks.append(drive)
+                        continue
+                
             try:
                 dev = parted.PedDevice.get (deviceFile)
             except parted.error, msg:
                 DiskSet.skippedDisks.append(drive)
                 continue
+            
             if (initAll and ((clearDevs is None) or (len(clearDevs) == 0)
                              or drive in clearDevs) and not flags.test):
-                try:
-                    disk = dev.disk_new_fresh(getDefaultDiskType())
-                    disk.commit()
-                    self.disks[drive] = disk
-                except parted.error, msg:
-                    DiskSet.skippedDisks.append(drive)
-                continue
+                if iutil.getArch() == "s390":
+                    if (self.dasdFmt(intf, drive)):
+                        DiskSet.skippedDisks.append(drive)
+                        continue                    
+                else:
+                    try:
+                        disk = dev.disk_new_fresh(getDefaultDiskType())
+                        disk.commit()
+                        self.disks[drive] = disk
+                    except parted.error, msg:
+                        DiskSet.skippedDisks.append(drive)
+                        continue
                 
             try:
                 disk = parted.PedDisk.new(dev)