*** empty log message ***

2 files changed, 45 insertions, 1 deletions

diff --git a/harddrive.py b/harddrive.py
new file mode 100644
index 000000000..ec892eb64
--- /dev/null
+++ b/harddrive.py
@@ -0,0 +1,43 @@
+# Install method for disk image installs (CD & NFS)
+
+from comps import ComponentSet, HeaderList
+import isys
+
+class InstallMethod:
+
+    def readComps(self, hdlist):
+	isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	cs = ComponentSet('i386', "/tmp/hdimage/" + self.tree + 
+		'/RedHat/base/comps', hdlist)
+	isys.umount("/tmp/hdimage")
+	return cs
+
+    def getFilename(self, h):
+	return self.tree + "/RedHat/RPMS/" + h[1000000]
+
+    def readHeaders(self):
+	isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	hl = HeaderList("/tmp/hdimage/" + self.path + "/RedHat/base/hdlist")
+	isys.umount("/tmp/hdimage")
+	return hl
+
+    def targetFstab(self, fstab):
+	self.isMounted = 0
+	for (device, fsystem, reformat) in fstab.items():
+	    if (device == self.device):
+		self.isMounted = 1
+		self.tree = "/mnt/sysimage" + fsystem + "/" + self.path
+		self.needsUnmount = 0
+
+	if (not self.isMounted):
+	    isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	    self.tree = "/tmp/hdimage/" + self.path
+	    self.needsUnmount = 1
+	    
+    def filesDone(self):
+	if (self.needsUnmount):
+	    isys.umount("/tmp/hdimage")
+	    
+    def __init__(self, device, path):
+	self.device = device
+	self.path = path
diff --git a/upd-instroot b/upd-instroot
index b117bdf4b..991e057fe 100755
--- a/upd-instroot
+++ b/upd-instroot
@@ -13,7 +13,7 @@ pythondeps() {
 
 	(cd $DIR; \
 	    chroot . strace -o straceout.$$ \
-		usr/bin/anaconda -p /mnt/source --test --text --traceonly
+		usr/bin/anaconda -m dir://mnt/source --test --text --traceonly
 	)
 
 	((cat $DIR/straceout.$$ |
@@ -125,6 +125,7 @@ usr/X11R6/lib/X11/fonts/misc/fonts*
 usr/X11R6/lib/X11/fonts/misc/cursor*
 usr/X11R6/lib/X11/fonts/misc/olcursor*
 usr/X11R6/lib/X11/xkb/*
+usr/X11R6/lib/X11/rgb/*
 usr/X11R6/lib/libXpm*
 usr/lib/libglib*
 usr/lib/libmodule*