* rescue.py (runShell): mount /dev/pts in rescue mode (#228714)

	* scripts/upd-instroot: include dmidecode on ia64 (#232947)

	* loader2/modules.c (scsiDiskCount): correctly count SCSI disk
	devices (#230526)

4 files changed, 22 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index bad735238..c1cb86672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-31  Dave Lehman  <dlehman@redhat.com>
+
+	* rescue.py (runShell): mount /dev/pts in rescue mode (#228714)
+
+	* scripts/upd-instroot: include dmidecode on ia64 (#232947)
+
+	* loader2/modules.c (scsiDiskCount): correctly count SCSI disk
+	devices (#230526)
+
 2007-05-31  Chris Lumens  <clumens@redhat.com>
 
 	* kickstart.py (AnacondaKSScript.run):  Don't traceback if we're
diff --git a/loader2/modules.c b/loader2/modules.c
index 997c1e7df..6f9c20693 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -97,27 +97,27 @@ static int scsiCount(char *conf) {
 
 static int scsiDiskCount(void) {
     struct device ** devices;
-    int i = 0;
+    int i = 0, count = 0;
 
     devices = probeDevices(CLASS_HD, BUS_SCSI, PROBE_LOADED);
     if (devices) {
-        for (; devices[i]; i++);
+        for (i=0; devices[i]; i++, count++);
         free(devices);
     }
     /* have to probe for usb floppies too */
     devices = probeDevices(CLASS_FLOPPY, BUS_SCSI, PROBE_LOADED);
     if (devices) {
-        for (; devices[i]; i++);
+        for (i=0; devices[i]; i++, count++);
         free(devices);
     }
     /* have to probe for usb cdrom too */
     devices = probeDevices(CLASS_CDROM, BUS_SCSI, PROBE_LOADED);
     if (devices) {
-        for (; devices[i]; i++);
+        for (i=0; devices[i]; i++, count++);
         free(devices);
     }
 
-    return i;
+    return count;
 }
 
 int mlReadLoadedList(moduleList * mlp) {
diff --git a/rescue.py b/rescue.py
index 8c430e44f..b9277a6f9 100644
--- a/rescue.py
+++ b/rescue.py
@@ -381,6 +381,9 @@ def runRescue(anaconda, instClass):
                 # now that dev is udev, bind mount the installer dev there
                 isys.mount("/dev", "%s/dev" %(anaconda.rootPath,), bindMount = 1)
 
+                # and /dev/pts
+                isys.mount("/dev/pts", "%s/dev/pts" %(anaconda.rootPath,), bindMount = 1)
+
                 # and /selinux too
                 if flags.selinux and os.path.isdir("%s/selinux" %(anaconda.rootPath,)):
                     try:
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b0e082a7e..5143101f9 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -127,7 +127,11 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
 	 python-pyblock mkinitrd libbdevid libbdevid-python"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
-    PACKAGES="$PACKAGES pcmciautils dmidecode"
+    PACKAGES="$PACKAGES pcmciautils"
+fi
+
+if [ $ARCH = i386 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then
+    PACKAGES="$PACKAGES dmidecode"
 fi
 
 if [ $ARCH = ia64 ]; then