diff options
| -rw-r--r-- | comps.py | 8 | ||||
| -rw-r--r-- | harddrive.py | 4 | ||||
| -rw-r--r-- | image.py | 2 | ||||
| -rw-r--r-- | iutil.py | 11 | ||||
| -rw-r--r-- | iw/xpms.py | 597 | ||||
| -rw-r--r-- | todo.py | 11 | ||||
| -rw-r--r-- | urlinstall.py | 5 |
7 files changed, 626 insertions, 12 deletions
@@ -1,6 +1,7 @@ import rpm from string import * import types +import iutil import urllib class Package: @@ -110,7 +111,8 @@ class ComponentSet: def keys(self): return self.compsDict.keys() - def readCompsFile(self, arch, filename, packages): + def readCompsFile(self, filename, packages): + arch = iutil.getArch () file = urllib.urlopen(filename) lines = file.readlines() @@ -184,7 +186,7 @@ class ComponentSet: return s - def __init__(self, arch, file, hdlist): + def __init__(self, file, hdlist): self.list = [] self.packages = hdlist - self.readCompsFile(arch, file, self.packages) + self.readCompsFile(file, self.packages) diff --git a/harddrive.py b/harddrive.py index 709216128..62914331a 100644 --- a/harddrive.py +++ b/harddrive.py @@ -15,8 +15,8 @@ class InstallMethod: isys.makeDevInode(self.device, '/tmp/' + self.device) isys.mount('/tmp/' + self.device, "/tmp/hdimage", fstype = self.fstype); - cs = ComponentSet('i386', "/tmp/hdimage/" + self.path + - '/RedHat/base/comps', hdlist) + cs = ComponentSet("/tmp/hdimage/" + self.path + + '/RedHat/base/comps', hdlist) isys.umount("/tmp/hdimage") return cs @@ -5,7 +5,7 @@ from comps import ComponentSet, HeaderListFromFile class InstallMethod: def readComps(self, hdlist): - return ComponentSet('i386', self.tree + '/RedHat/base/comps', hdlist) + return ComponentSet(self.tree + '/RedHat/base/comps', hdlist) def getFilename(self, h): return self.tree + "/RedHat/RPMS/" + h[1000000] @@ -1,6 +1,17 @@ import types, os, sys, isys, select +def getArch (): + arch = os.uname ()[4] + if (len (arch) == 4 and arch[0] == 'i' and + arch[2:3] == "86"): + arch = "i386" + + if arch == "sparc64": + arch = "sparc" + + return arch + def getfd(filespec, readOnly = 0): if type(filespec) == types.IntType: return filespec diff --git a/iw/xpms.py b/iw/xpms.py index 3f990a7f0..8a9c87f2c 100644 --- a/iw/xpms.py +++ b/iw/xpms.py @@ -1,3 +1,600 @@ +DIALUP_WORKSTATION_XPM = [ +"48 48 242 2", +" c #020204", +". c #0e0a0c", +"X c #0e0e0c", +"o c #161214", +"O c #161614", +"+ c #1e1a1c", +"@ c #1e1e1c", +"# c #221e24", +"$ c #222224", +"% c #262224", +"& c #262624", +"* c #262a24", +"= c #2a262c", +"- c #2a2a2c", +"; c #2a2e2c", +": c #2e2e2c", +"> c #2e322c", +", c #323234", +"< c #323634", +"1 c #363634", +"2 c #3a3634", +"3 c #3e363c", +"4 c #3a3a34", +"5 c #3e3a34", +"6 c #3e3e34", +"7 c #3a3a3c", +"8 c #3e3a3c", +"9 c #3e3e3c", +"0 c #423e3c", +"q c #423a44", +"w c #423e44", +"e c #42423c", +"r c #46463c", +"t c #424244", +"y c #464244", +"u c #444644", +"i c #4a4644", +"p c #4a464c", +"a c #4a4a44", +"s c #4e4a44", +"d c #4e4e44", +"f c #4a4a4c", +"g c #4a4e4c", +"h c #4e4e4c", +"j c #425254", +"k c #524e4c", +"l c #52524c", +"z c #56524c", +"x c #56564c", +"c c #5a564c", +"v c #525254", +"b c #525654", +"n c #565654", +"m c #565a54", +"M c #5a5654", +"N c #5a5a54", +"B c #5e5a54", +"V c #5e5e54", +"C c #5a5a5c", +"Z c #5a5e5c", +"A c #5e5e5c", +"S c #526a64", +"D c #625e54", +"F c #626254", +"G c #62625c", +"H c #67625c", +"J c #66665c", +"K c #6a665c", +"L c #6a6a5c", +"P c #626264", +"I c #626664", +"U c #6a6664", +"Y c #6a6a64", +"T c #6a6a6c", +"R c #6a6e6c", +"E c #6e6a6c", +"W c #6e6e6c", +"Q c #726a64", +"! c #726a6c", +"~ c #726e6c", +"^ c #766e6c", +"/ c #72726c", +"( c #77726c", +") c #76766c", +"_ c #7a766c", +"` c #7a7a6c", +"' c #7e7a6c", +"] c #727274", +"[ c #727674", +"{ c #767274", +"} c #767674", +"| c #727a74", +" . c #7a7274", +".. c #7a7674", +"X. c #7e7674", +"o. c #7a7a74", +"O. c #7e7a74", +"+. c #7e7e74", +"@. c #7a7a7c", +"#. c #7a7e7c", +"$. c #7e7a7c", +"%. c #7e7e7c", +"&. c #827a74", +"*. c #827e74", +"=. c #827a7c", +"-. c #827e7c", +";. c #867e7c", +":. c #9e6a64", +">. c #9a7a6c", +",. c #9a7e6c", +"<. c #a66e6c", +"1. c #ae7a6c", +"2. c #827e84", +"3. c #8a9a3c", +"4. c #96ba24", +"5. c #8a965c", +"6. c #8a8664", +"7. c #868274", +"8. c #82827c", +"9. c #86827c", +"0. c #86867c", +"q. c #8a827c", +"w. c #8a867c", +"e. c #8e867c", +"r. c #8a8a7c", +"t. c #8e8a7c", +"y. c #828284", +"u. c #868284", +"i. c #868684", +"p. c #868e84", +"a. c #8a8284", +"s. c #8a8684", +"d. c #8e8684", +"f. c #8a8a84", +"g. c #8e8a84", +"h. c #8e8e84", +"j. c #8e8a8c", +"k. c #8e8e8c", +"l. c #928a84", +"z. c #928e84", +"x. c #968e84", +"c. c #928a8c", +"v. c #929284", +"b. c #969284", +"n. c #969684", +"m. c #92928c", +"M. c #96928c", +"N. c #96968c", +"B. c #9a928c", +"V. c #9a968c", +"C. c #9e968c", +"Z. c #9e9a8c", +"A. c #929294", +"S. c #969294", +"D. c #969694", +"F. c #9a9694", +"G. c #9a9a94", +"H. c #9e9e94", +"J. c #9a9a9c", +"K. c #9e9a9c", +"L. c #9e9e9c", +"P. c #a68a84", +"I. c #a19a94", +"U. c #a29e94", +"Y. c #a29e9c", +"T. c #a2a294", +"R. c #a6a294", +"E. c #a6a29c", +"W. c #a6a69c", +"Q. c #aaa29c", +"!. c #aaa69c", +"~. c #aaaa9c", +"^. c #aeaa9c", +"/. c #a3a2a4", +"(. c #a6a6a4", +"). c #aaa6a4", +"_. c #aaaaa4", +"`. c #aeaaa4", +"'. c #aeaea4", +"]. c #aaaaac", +"[. c #aeaaac", +"{. c #aeaeac", +"}. c #b2aea4", +"|. c #b6aea4", +" X c #b6b2a4", +".X c #b2b2ac", +"XX c #b6b6ac", +"oX c #bab6ac", +"OX c #bebaac", +"+X c #b2b2b4", +"@X c #b6b2b4", +"#X c #b6b6b4", +"$X c #bab6b4", +"%X c #b9bab4", +"&X c #bebab4", +"*X c #bebeb4", +"=X c #bababc", +"-X c #bebebc", +";X c #bec2bc", +":X c #c2beb4", +">X c #c6beb4", +",X c #c2bebc", +"<X c #c6c2bc", +"1X c #c6c6bc", +"2X c #cec6bc", +"3X c #cecabc", +"4X c #c2c2c4", +"5X c #c6c2c4", +"6X c #c6c6c4", +"7X c #cacac4", +"8X c #cecec4", +"9X c #cececc", +"0X c #d6cec4", +"qX c #d6d2c4", +"wX c #d2d2cc", +"eX c #d6d6cc", +"rX c #ded6cc", +"tX c #d2d2d4", +"yX c #d2d6d4", +"uX c #d6d2d4", +"iX c #d6d6d4", +"pX c #dad6d4", +"aX c #dadad4", +"sX c #dedad4", +"dX c #deded4", +"fX c #dbdadc", +"gX c #dededc", +"hX c #e6ded4", +"jX c #e2dee4", +"kX c #e6e2d4", +"lX c #e2e2dc", +"zX c #e6e6dc", +"xX c #eeeadc", +"cX c #e2e2e4", +"vX c #e6e6e4", +"bX c #f2f2f4", +"nX c #f2f6f4", +"mX c #f6f6f4", +"MX c #fafafc", +"NX c #fefefc", +"BX c Gray100", +"VX c None", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVX VXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVX eXxXxXxXxXxXzXzXkXkXdXdXsXrXeXeXqX0X8X3X3X2X1X<X>X%X$XoX|.G.t. VXVXVXVXVXVXVX", +"VXVXVXVXVXVXVX eXxXxXxXxXxXvXzXkXkXgXdXsXrXiXeXqX9X8X3X3X2X1X<X>X:X&XoX|.'.).U.8. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXxX@X@.@.@.o.@.@.[ [ ] R R Y I P G Z Z C C b v f g f i p 9 #.U.l. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXxX@.k.5XK.D.j.u.i.k.u.[ [ ] R R G G P l g g a u a y y 9 3 3 I.M. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXxXj.#XvX#X(.u.#.o.@.[ ] J G P A n n n v h a g f y p t 8 8 < Z.b. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXxX@.(.;XD.i.S.S.fXnXNXNXBXBXmXMXmXmXMXBXMXbXuXk.C n w 8 , , G.k. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXvX} (.=X[ [ /.{.+X{.{.{.{.{.{.{.{.{.{.+X.X+X#X#X/.t 8 1 1 : N.z. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX xXvX@.K.A.i.cXBXBXMXNXbXA.W Z @.b b @.g P BXMXbXbXbX9X2 1 > - m.g. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX kXzX@.j.k.W {.=X-X&X#X=XC gXm b b v v tXu +X#X#X{.{.J.7 , ; : x.g. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX kXhXi.D.S.K.(.bXMXnXbXu.R nXMXMXBXbXnXnXZ m nXmXMXbXh < : - * c.s. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX hXgX] i.@.R I I I P Z Z {.+X#X#X+X#X#X#X+Xw q w 1 7 < : : - % h.0. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX lXsX~ @.T @.P P P Z Z ].mXBX4X9 9 : {.MXmX4Xq 7 1 > : , * & & j.0. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX sXgX#.i.T i.[ S.W R k.#X=X} : +X#X=X= W =X#Xv A < P , * * & % g.q. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX dXiXR [ I I P Z m m {.nXBXt BXMXbXNXMX9 MXMX4X> : : * & - $ @ e.-. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX eXaXJ / I G Z Z R U -X,X4X: =X=X-X-X-X@ -X-X=X, , ; - & % @ @ u.*. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX eXeXP T A y.R #.T I mXBXMXy.v BXMXMXb (.nXMXbX: * & - % # @ + y.=. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX qX0XI G P Z n b b v -X-X-X-XT : , : P -X,X-X=X; - - % @ @ + O 9.o. VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 0X8XP Z m C l b v f | bXbXbXbXbXbXbXbXMXbXbXA.& & % $ @ + O O +... VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 8X8XZ Z m b b h l g f (.=X%X=X%X=X=X%X=X+X%.* - = $ # # O O o $... VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 3X3Xm C b b v f g u y u w 0 q 4 1 > : , * = & % @ @ + + O o X O.{ VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 3X2XN b l l g g f p p w 9 8 7 1 < , , * - * & $ $ # O O o X X .. . VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 2X6Xl b f.D.S.y.k.#.K.j.@.D.[ u.L.W R k.U ..j.i.| i.2.W 2.v . .( VXVXVXVXVXVX", +"VXVXVXVXVXVXVX 1X1XA.v f f f y i 9 w q 1 1 > : : ; & & = & # + O O o X X . n ..^ VXVXVXVXVXVX", +"VXVXVXVXVXVXVX }.:X%X%XoX X.X[.}.^._.).).Q.Y.Y.Y.I.D.S.F.k.k.k.j.f.i.2.$.X. . .G VXVXVXVXVXVX", +"VXVXVXVXVXVXVX VXG.}.}._.).).!.U.Y.1.P.Z.z.<.>.k.M.:.,.s.c.-.~ 8.5.4.3. .{ ! V N VXVXVXVXVXVX", +"VXVXVXVXVXVXVXVX VXS 6.H.Z.Z.Z.C.m.S.M.k.g.j.z.d.w.u.;.;.2.%.=.o.{ ( E U N j j VXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVX t e h / Q d Z ) ` B H ) ] x M B s k VXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVX k a V G l l F A b G L H n D L ! N Z VXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVX +.8.z.z.h.j.r.0.q.u.9.7.O.=.&.} ..X.( / E J V V k VXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVX p.h.V.B.M.M.M.k.h.j.g.g.0.i.q.a.%.*.&.` { E E z z VXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVX VXVXVXVXVXVXVX", +"VXVXVXVXVXVXVX w.%XoXoXXXXX X.X}.}.'.^.~.!.!.R.R.T.U.U.H.Z.G.Z.V.n.b.v.z.z.) x e VXVXVXVXVXVX", +"VXVXVXVXVXVXVX OXjXaXY.pXpX'.pXaXG.pXiXj.eXiX_.iXuXG.tXqXwXwXr.V.9X8.6XR 7X$Xs B VXVXVXVXVXVX", +"VXVXVXVXVXVX t.dX`.b.b.v.z.h.t.h.w.w.w.0.7.7.*.*.+.+.' O._ _ l V.uXk c x c x 6 0 5 VXVXVXVXVX", +"VXVXVXVXVXVX &XsXL.aXpXK.iXpX_.iXiXm.eXiXA.iXiXG.iXqXA.tXqXaX_ D ;X*XG ^.g !..Xa g VXVXVXVXVX", +"VXVXVXVXVX K gX{.M.v.` v.h.z.t.t.r.w.w.7.7.;.*.&.+.O.' .._ ) / D b.6Xx x x x l k 4 6 VXVXVXVX", +"VXVXVXVXVX 1XcX,XaXaX-XpXpX_.pXiX].iXiX_.uXeX_.eXyX_.qXtXE.wXwXc N.7X@XK _.H !.!.c 2 VXVXVXVX", +"VXVXVXVX *.gXOXoXoXoXXX X X.X}.^.'.^.~.~.!.R.T.U.U.H.H.H.Z.V.N.B z '.7XU O.b s XX0.6 4 VXVXVX", +"VXVXVXVX :XcXG.fXaXf.pXaXF.pXiXpXiXiXiXeXiXiXiXiXwXi.qXwX@.tXwX8Xr z.4Xn.~. XF R.0.k 1 VXVXVX", +"VXVXVX w.R.W.W.Q.R.T.U.H.H.Z.G.V.V.b.M.z.z.z.h.z.r.w.w.w.0.7.*.*.a +.' 1 u a u r r r & 4 VXVX", +"VXVXVX c B c B V H K H H F H D D B D B V Z N c x c x z l z z l k k s i s s i i i e r a @ VXVX", +"VXVXVXVX VXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX", +"VXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVXVX" +] + +NETWORKED_WORKSTATION_XPM = [ +"48 48 251 2", +" c #020204", +". c #0c0a0c", +"X c #0e0e0c", +"o c #121214", +"O c #161214", +"+ c #161614", +"@ c #1a1a1c", +"# c #1e1e1c", +"$ c #221e24", +"% c #222224", +"& c #262224", +"* c #262624", +"= c #2a262c", +"- c #282a24", +"; c #2b2a2c", +": c #2e2e2c", +"> c #2e322c", +", c #322e34", +"< c #323234", +"1 c #363634", +"2 c #3a3634", +"3 c #3e363c", +"4 c #383a34", +"5 c #3e3e34", +"6 c #3a3a3c", +"7 c #3a3e3c", +"8 c #3e3a3a", +"9 c #3e3e3c", +"0 c #423e3c", +"q c #433e44", +"w c #43423c", +"e c #46463c", +"r c #424244", +"t c #464244", +"y c #454644", +"u c #464a44", +"i c #4a4644", +"p c #4a424c", +"a c #4b464c", +"s c #4a4a44", +"d c #4e4a44", +"f c #4e4e44", +"g c #4a4a4c", +"h c #4a4e4c", +"j c #4e4a4c", +"k c #4e4e4c", +"l c #4e524c", +"z c #425254", +"x c #524e4c", +"c c #524e54", +"v c #52524c", +"b c #56524c", +"n c #56564c", +"m c #5a564c", +"M c #525254", +"N c #525654", +"B c #565254", +"V c #565654", +"C c #565a56", +"Z c #5a5658", +"A c #5a5a54", +"S c #5e5a54", +"D c #5e5e54", +"F c #5a5a5c", +"G c #5a5e5c", +"H c #5e5e5c", +"J c #5e625c", +"K c #526a64", +"L c #625e56", +"P c #64625a", +"I c #66665c", +"U c #6a625c", +"Y c #6a665c", +"T c #6a6a5c", +"R c #626264", +"E c #626664", +"W c #666664", +"Q c #676a64", +"! c #6a6664", +"~ c #6e6660", +"^ c #6a666c", +"/ c #6a6a6c", +"( c #6a6e6c", +") c #6e6a6c", +"_ c #6e6e6c", +"` c #706e64", +"' c #726a69", +"] c #766e6c", +"[ c #726e70", +"{ c #70726c", +"} c #78726c", +"| c #7a766c", +" . c #7a7a6c", +".. c #7e7a6c", +"X. c #727274", +"o. c #727674", +"O. c #767674", +"+. c #767a74", +"@. c #7a7274", +"#. c #7a7674", +"$. c #7e7674", +"%. c #7a7a74", +"&. c #7f7a74", +"*. c #7e7e74", +"=. c #7a7a7c", +"-. c #7a7e7c", +";. c #7e7a7c", +":. c #7e7e7c", +">. c #7e827c", +",. c #827e74", +"<. c #827a7c", +"1. c #827e7c", +"2. c #867e7c", +"3. c #9e6a64", +"4. c #9a7e74", +"5. c #a66e6c", +"6. c #ae7a6c", +"7. c #827e84", +"8. c #8a9a3c", +"9. c #96ba24", +"0. c #8a965c", +"q. c #8a8664", +"w. c #868274", +"e. c #82827a", +"r. c #86827c", +"t. c #86867c", +"y. c #8a827c", +"u. c #8a867c", +"i. c #8e867c", +"p. c #8a8a7c", +"a. c #8e8a7c", +"s. c #828284", +"d. c #828684", +"f. c #868284", +"g. c #868684", +"h. c #868a84", +"j. c #8b8684", +"k. c #8a868c", +"l. c #8a8a84", +"z. c #8e8a84", +"x. c #8e8e84", +"c. c #8a8a8c", +"v. c #8a8e8c", +"b. c #8e8a8c", +"n. c #8e8e8c", +"m. c #8e928f", +"M. c #928a84", +"N. c #928e84", +"B. c #928a8c", +"V. c #928e8c", +"C. c #928e94", +"Z. c #929284", +"A. c #969284", +"S. c #969684", +"D. c #92928c", +"F. c #96928c", +"G. c #96968c", +"H. c #9a928c", +"J. c #9a968c", +"K. c #9e968c", +"L. c #9e9a8c", +"P. c #929294", +"I. c #969294", +"U. c #969694", +"Y. c #969a94", +"T. c #9a9694", +"R. c #9a969c", +"E. c #9b9a94", +"W. c #9e9e94", +"Q. c #9a9a9c", +"!. c #9a9e9c", +"~. c #9e9a9c", +"^. c #9e9e9c", +"/. c #9ea29c", +"(. c #a68a84", +"). c #a29a94", +"_. c #a29e94", +"`. c #a29e9c", +"'. c #a29ea4", +"]. c #a2a294", +"[. c #a6a294", +"{. c #a7a29c", +"}. c #a6a69c", +"|. c #aaa69c", +" X c #adaa9c", +".X c #a3a2a4", +"XX c #a6a6a4", +"oX c #aaa6a4", +"OX c #aaaaa4", +"+X c #aeaaa4", +"@X c #aeaea4", +"#X c #aaaaac", +"$X c #aeaaac", +"%X c #aeaeac", +"&X c #aeaeb4", +"*X c #b2aea4", +"=X c #b2aeac", +"-X c #b6b2a4", +";X c #b2b2ac", +":X c #bab2ac", +">X c #bab6ac", +",X c #bebaac", +"<X c #b1b2b4", +"1X c #b6b2b4", +"2X c #b6b6b4", +"3X c #b6bab4", +"4X c #bdbab5", +"5X c #bebeb4", +"6X c #bebebc", +"7X c #bec2bc", +"8X c #c4beb4", +"9X c #c2bebc", +"0X c #c6c2ba", +"qX c #c6c6be", +"wX c #cec6bc", +"eX c #cecabc", +"rX c #c4c2c4", +"tX c #cacac4", +"yX c #cececc", +"uX c #d0cec2", +"iX c #d6cec4", +"pX c #d6d2c4", +"aX c #d2d2cc", +"sX c #d6d6cc", +"dX c #ded6cc", +"fX c #d2d2d4", +"gX c #d6d2d4", +"hX c #d6d6d4", +"jX c #dad6d4", +"kX c #dadad4", +"lX c #dedad2", +"zX c #deded4", +"xX c #dcdadc", +"cX c #dddedc", +"vX c #dedee4", +"bX c #e2dad4", +"nX c #e5ded7", +"mX c #e6e2d4", +"MX c #e2e2dc", +"NX c #e6e6dc", +"BX c #eeeadc", +"VX c #e2e2e4", +"CX c #e6e6e4", +"ZX c #eaeaec", +"AX c #eeeeec", +"SX c #f1f2f4", +"DX c #f6f9f9", +"FX c #fafafc", +"GX c #fefefc", +"HX c Gray100", +"JX c None", +"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJX JXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJX sXBXBXBXBXBXNXNXmXmXzXzXlXdXsXsXpXiXuXeXeXwXqX0X8X4X>X>X*XE.a. JXJXJXJXJXJXJX", +"JXJXJXJXJXJXJX sXBXBXBXBXBXCXNXmXmXcXzXxXbXkXkXjXaXaXuXeXwXqX0X8X5X4X>X*X@XoX_.e. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX BXBX1X=.=.=.%.=.=.+.-.s.>.>.s.>.>.:.+.X._ R C V k l j a a 9 -._.M. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX AXBX=.n.rX~.U.C.k.D.^.'.E.!.~.^./.U.Y.P.:.( R C c l j a q 3 3 ).F. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX BXAXb.2XCX2XXXk.h.I.^..X#XaX%XDXFXSXDXXX^.n.+./ H B j y 9 8 1 ~.F. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX BXBX=.oX7XU.c.'.#XY.<X;XV : < ^.$X, g.E k rX^.c..XX.R p q 1 < L.x. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX BXCX#.XX3X+.:.U.U.XX<X4 : r b.FXSXc.CXyX% % v.P.7.R F a 9 1 : G.x. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX CXZX+.~.I.v.I.Y.<X<X+ @ F o 2X#X&Xn.& @ M B + `.l.) S y 9 > ; F.z. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX NXmX=.b.n.=.s.Y.XXvXk CXHX+.vXDXHXQ.9 k FXSXP.XXC.;.G u 7 > : V.z. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX mXnXg.U.R.XXXXXX2XX.# r V s.XX&X<X#X#X%XE.J k H <Xn.O.g 6 < - M.j. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX nXvXX.g.:.:.b.!.xXy : < o @ u m.DXDXn.7 o r / % Q.s.E g 6 : * x.t. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX MXlXX.=.o.c.c./.#X* . o @ % % V <X!.: 6 O . : : Q.s.W h 4 - * b.g. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX lXcX-.g.( U.Y.4XvXr X . 9 1 - vXDXk 8 1 # * < 9 m.Q.R y < ; & z.y. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX zXsX( X.E { d.U.#Xr @ o % U.2X<X&X<X< 9 o # % + [ O.G r > = # i.1. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX jXhXW { Q ( +.v.OX6Xr - M AXHXHXGXDXFXDX; # X B d.{ M 9 ; % # f.,. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX kXsXE ( R k.>././.#Xk N : _ 2X<X<X&X&X&Xo . - g.=.R g 8 ; # @ f.<. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX pXiXE H H J Q o.v.Q.yXR 1 M rXHXGXFXAXZX* 4 s.g.X.F t : * $ + r.%. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX iXyXR G G F G Q -.v.Q.XX.Xg V U.&X2XE.#X=.:.h.+.R c 6 : & + + *.#. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX yXeXG G Z N N H ) +.g.U.Q.hX2X6XfXyXfXn.c.s.O.W M 6 ; & @ + O &.#. JXJXJXJXJXJX", +"JXJXJXJXJXJXJX eXeXG C M N M l V R ) ;.s.k.b.c.h.d.s.s.o./ H c 6 > & + @ O X &.} JXJXJXJXJXJX", +"JXJXJXJXJXJXJX uXwXZ N N M k h h c Z H R ) X.o._ / ( J H l p 1 , & @ @ O X X #.} JXJXJXJXJXJX", +"JXJXJXJXJXJXJX eXtXN N b.I.I.f.n.-.~.I.s.^.g.R.%Xk.d.Q.=.d.I.c.-.c.7._ 7.l . @.} JXJXJXJXJXJX", +"JXJXJXJXJXJXJX qX0XC.l u h y p t r q q 6 9 7 7 9 4 < < , ; * $ @ + O X X . V #.] JXJXJXJXJXJX", +"JXJXJXJXJXJXJX *X0X,X4X>X:X;X=X+X+XXXoXoX{.`.`.`._.T.H.K.B.n.b.b.l.f.7.<.$.@.} R JXJXJXJXJXJX", +"JXJXJXJXJXJXJX JXJ.=X*XOXOXXX|.{._.6.(.).M.5.4.D.H.3.4.j.B.,.{ e.0.9.8.@.} ' H A JXJXJXJXJXJX", +"JXJXJXJXJXJXJXJX JXK q.W.W.E.K.T.G.F.F.Z.z.z.z.i.u.f.2.f.1.<.$.| } { ) ^ F z z JXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJX y w f [ ` k D O. .A Y O.{ n S G j v JXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJX x s J D v v L H N L T U N S ' ' m G JXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJX *.e.N.N.v.i.z.t.r.t.t.2.:.&.<.| | | | o.) W D D x JXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJX v.x.J.H.U.Z.F.n.x.z.x.i.g.t.2.f.:.&.<. .} ) ) b b JXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJX JXJXJXJXJXJXJX", +"JXJXJXJXJXJXJX u.,X>X>X>X>X;X-X*X*X X XOX|.|.[.[.]._._.W.L.E.L.J.S.A.Z.N.N.| n w JXJXJXJXJXJX", +"JXJXJXJXJXJXJX ,XcXkX^.sXhX+XhXkXQ.jXhXz.sXhXOXhXhXE.aXgXaXaXp.J.yXe.qX( tX>Xd A JXJXJXJXJXJX", +"JXJXJXJXJXJX a.cXOXA.A.Z.Z.M.a.a.p.u.u.t.w.w.,.,.*.*.....| | v J.gXx m n n n 0 0 8 JXJXJXJXJX", +"JXJXJXJXJXJX ,XxX`.xXjX~.hXkX#XhXhXD.hXhXP.hXhXE.sXfXG.fXaXkX| L 7X5XP +Xh |.;Xu f JXJXJXJXJX", +"JXJXJXJXJX ~ cX%XA.Z. .N.a.N.x.a.p.u.u.w.w.2.,.<.*. ...| | O.{ L A.qXN m n n b x 4 5 JXJXJXJX", +"JXJXJXJXJX qXVX6XkXxX9XkXkXOXjXhX$XsXhXOXgXsX}.sXsXoXgXfX{.aXaXZ G.tX-XI OXP }.}.m 2 JXJXJXJX", +"JXJXJXJX ,.nX,X>X>X2X>X-X-X;X*X X+X XOX X}.{.].`._.W._.W.L.K.J.A b @XtX! &.n d 2Xt.5 4 JXJXJX", +"JXJXJXJX 5XVXE.kXkXz.hXhXU.jXhXjXhXhXsXhXsXhXhXsXsXt.aXaX%.aXaXyXe N.rXG.OX;XP [.u.x 2 JXJXJX", +"JXJXJX u.[.}.|.[.[.[._._.L.L.E.L.J.F.A.N.Z.N.x.z.p.u.u.u.t.e.2.,.d *...1 i u e e e e * 4 JXJX", +"JXJXJX m S m A L P I I P E P L L S D S D S A m m m m b v b b v x f d i d s i i y w e s # JXJX", +"JXJXJXJX JXJXJX", +"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX", +"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX" +] + CONSOLE_MULTIMEDIA_XPM = [ "48 48 167 2", " c Gray0", @@ -504,9 +504,14 @@ class ToDo: fstab = {} for line in lines: fields = string.split (line) - if fields and fields[2] == "ext2" or fields[2] == "swap" \ - and fields[3] == "defaults": - fstab[fields[1]] = (fields[0][5:], fields[2], 0) + # skip comments + if fields and fields[0][0] == '#': + continue + # all valid fstab entries have 6 fields + if len (fields) == 6: + if fields and fields[2] == "ext2" or fields[2] == "swap" \ + and fields[3] == "defaults": + fstab[fields[1]] = (fields[0][5:], fields[2], 0) return fstab def writeLanguage(self): diff --git a/urlinstall.py b/urlinstall.py index b75f0b193..0799b279d 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -20,9 +20,8 @@ FILENAME = 1000000 class InstallMethod: def readComps(self, hdlist): - return ComponentSet('i386', self.baseUrl + - '/RedHat/base/comps', hdlist) - return cs + return ComponentSet(self.baseUrl + '/RedHat/base/comps', + hdlist) def getFilename(self, h): root = "/mnt/sysimage" |