From c93a435464a19a1cbca933130e8f76e06ce61582 Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Tue, 28 Dec 1999 22:17:22 +0000 Subject: changes for raid upgrades (not done yet) --- fstab.py | 41 +++++- isys/isys.c | 39 ++++++ isys/isys.py | 23 ++++ po/anaconda.pot | 410 +++++++++++++++++++++++++++++--------------------------- todo.py | 69 +++------- 5 files changed, 330 insertions(+), 252 deletions(-) diff --git a/fstab.py b/fstab.py index d849dd5e5..26049a49e 100644 --- a/fstab.py +++ b/fstab.py @@ -17,6 +17,7 @@ import isys import iutil import os +import string def _(str): return str @@ -147,6 +148,12 @@ class Fstab: if fsystem != "swap": continue fstab.append((partition, 1)) + + for n in self.extraFilesystems: + (mntpoint, device, fsType, doFormat, size) = n + if fsType != "swap": continue + fstab.append((device, 1)) + return fstab def turnOnSwap(self): @@ -223,16 +230,15 @@ class Fstab: rt.write("\n") rt.close() - def umountFilesystems(self): + def umountFilesystems(self, instPath): if (not self.setupFilesystems): return - isys.umount(self.instPath + '/proc') + isys.umount(instPath + '/proc') - for (mntpoint, device, fsystem, doFormat, size) in self.mountList(): + for (n, device, fsystem, doFormat, size) in self.mountList(): if fsystem != "swap": try: - mntPoint = self.instPath + n - self.log("unmounting " + mntPoint) + mntPoint = instPath + n isys.umount(mntPoint) except SystemError, (errno, msg): self.messageWindow(_("Error"), @@ -425,6 +431,8 @@ class Fstab: if not skipExtra: for n in self.extraFilesystems: + (mntpoint, sevice, fsType, doFormat, size) = n + if fsType == "swap": continue fstab.append(n) fstab.sort(sortMounts) @@ -507,3 +515,26 @@ class NewtFstab(Fstab): Fstab.__init__(self, fsedit, setupFilesystems, serial, zeroMbr, readOnly, waitWindow, messageWindow) + +def readFstab (path, fstab): + f = open (path, "r") + lines = f.readlines () + f.close + for line in lines: + fields = string.split (line) + # skip comments + if fields and fields[0][0] == '#': + continue + if not fields: continue + # all valid fstab entries have 6 fields + if len (fields) < 4 or len (fields) > 6: continue + + if fields[2] != "ext2" and fields[2] != "swap": continue + if string.find(fields[3], "noauto") != -1: continue + if (fields[0][0:7] != "/dev/hd" and + fields[0][0:7] != "/dev/sd" and + fields[0][0:7] != "/dev/md" and + fields[0][0:8] != "/dev/rd/" and + fields[0][0:9] != "/dev/ida/"): continue + + fstab.addMount(fields[0][5:], fields[1], fields[2]) diff --git a/isys/isys.c b/isys/isys.c index 5be528ef6..729574eac 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -47,8 +47,12 @@ static PyObject * doLoSetup(PyObject * s, PyObject * args); static PyObject * doUnLoSetup(PyObject * s, PyObject * args); static PyObject * doDdFile(PyObject * s, PyObject * args); static PyObject * doGetRaidSuperblock(PyObject * s, PyObject * args); +static PyObject * doRaidStart(PyObject * s, PyObject * args); +static PyObject * doRaidStop(PyObject * s, PyObject * args); static PyMethodDef isysModuleMethods[] = { + { "raidstop", (PyCFunction) doRaidStop, METH_VARARGS, NULL }, + { "raidstart", (PyCFunction) doRaidStart, METH_VARARGS, NULL }, { "getraidsb", (PyCFunction) doGetRaidSuperblock, METH_VARARGS, NULL }, { "losetup", (PyCFunction) doLoSetup, METH_VARARGS, NULL }, { "unlosetup", (PyCFunction) doUnLoSetup, METH_VARARGS, NULL }, @@ -943,3 +947,38 @@ static PyObject * doGetRaidSuperblock(PyObject * s, PyObject * args) { sb.set_magic, sb.level, sb.nr_disks, sb.raid_disks, sb.md_minor); } + +static PyObject * doRaidStop(PyObject * s, PyObject * args) { + int fd; + + if (!PyArg_ParseTuple(args, "i", &fd)) return NULL; + + if (ioctl(fd, STOP_ARRAY, 0)) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * doRaidStart(PyObject * s, PyObject * args) { + int fd; + char * dev; + struct stat sb; + + if (!PyArg_ParseTuple(args, "is", &fd, &dev)) return NULL; + + if (stat(dev, &sb)) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } + + if (ioctl(fd, START_ARRAY, sb.st_rdev)) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } + + Py_INCREF(Py_None); + return Py_None; +} diff --git a/isys/isys.py b/isys/isys.py index efcd55437..374282c35 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -3,6 +3,29 @@ import _isys import string import os +def raidstop(mdDevice): + makeDevInode(mdDevice, "/tmp/md") + fd = os.open("/tmp/md", os.O_RDONLY) + os.remove("/tmp/md") + _isys.raidstop(fd) + os.close(fd) + +def raidstart(mdDevice, aMember): + makeDevInode(mdDevice, "/tmp/md") + makeDevInode(aMember, "/tmp/member") + fd = os.open("/tmp/md", os.O_RDONLY) + os.remove("/tmp/md") + _isys.raidstart(fd, "/tmp/member") + os.close(fd) + os.remove("/tmp/member") + +def raidsb(mdDevice): + makeDevInode(mdDevice, "/tmp/md") + fd = os.open("/tmp/md", os.O_RDONLY) + rc = _isys.getraidsb(fd) + os.close(fd) + return rc + def losetup(device, file): loop = os.open(device, os.O_RDONLY) targ = os.open(file, os.O_RDWR) diff --git a/po/anaconda.pot b/po/anaconda.pot index 43a3461eb..7c5a9642b 100644 --- a/po/anaconda.pot +++ b/po/anaconda.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-27 09:57-0500\n" +"POT-Creation-Date: 1999-12-28 17:07-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,48 +14,49 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: ../fstab.py:144 ../fstab.py:288 +#: ../fstab.py:165 ../fstab.py:308 msgid "Formatting" msgstr "" -#: ../fstab.py:145 +#: ../fstab.py:166 #, c-format msgid "Formatting swap space on /dev/%s..." msgstr "" -#: ../fstab.py:157 ../fstab.py:224 ../fstab.py:314 +#: ../fstab.py:178 ../fstab.py:244 ../fstab.py:358 #: ../libfdisk/newtfsedit.c:1540 ../loader/devices.c:178 #: ../loader/devices.c:183 ../loader/loader.c:471 ../loader/loader.c:481 #: ../loader/loader.c:697 ../loader/loader.c:742 ../loader/loader.c:880 #: ../loader/loader.c:885 ../loader/loader.c:1621 ../loader/loader.c:1667 #: ../loader/loader.c:1738 ../loader/urls.c:206 ../loader/urls.c:211 -#: ../text.py:234 ../text.py:694 ../todo.py:880 ../todo.py:1206 +#: ../text.py:234 ../text.py:694 ../todo.py:340 ../todo.py:823 ../todo.py:852 +#: ../todo.py:1176 msgid "Error" msgstr "" -#: ../fstab.py:157 +#: ../fstab.py:178 msgid "Error creating swap on device " msgstr "" -#: ../fstab.py:225 +#: ../fstab.py:245 #, c-format msgid "Error unmounting %s: %s" msgstr "" -#: ../fstab.py:241 ../todo.py:523 +#: ../fstab.py:261 ../todo.py:480 msgid "Creating" msgstr "" -#: ../fstab.py:241 +#: ../fstab.py:261 msgid "Creating RAID devices..." msgstr "" -#: ../fstab.py:289 +#: ../fstab.py:309 #, c-format msgid "Formatting %s filesystem..." msgstr "" -#: ../fstab.py:315 +#: ../fstab.py:359 #, c-format msgid "Error mounting %s: %s" msgstr "" @@ -76,10 +77,10 @@ msgstr "" #: ../text.py:440 ../text.py:449 ../text.py:467 ../text.py:480 ../text.py:517 #: ../text.py:519 ../text.py:545 ../text.py:548 ../text.py:557 ../text.py:615 #: ../text.py:616 ../textw/constants.py:10 ../textw/lilo.py:27 -#: ../textw/lilo.py:78 ../textw/lilo.py:85 ../textw/lilo.py:160 +#: ../textw/lilo.py:79 ../textw/lilo.py:86 ../textw/lilo.py:161 #: ../textw/packages.py:20 ../textw/packages.py:85 ../textw/packages.py:136 #: ../textw/packages.py:145 ../textw/partitioning.py:23 -#: ../textw/partitioning.py:63 ../textw/partitioning.py:205 +#: ../textw/partitioning.py:63 ../textw/partitioning.py:207 #: ../textw/silo.py:26 ../textw/silo.py:86 ../textw/silo.py:185 #: ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:141 #: ../textw/userauth.py:172 ../textw/userauth.py:244 @@ -155,8 +156,8 @@ msgstr "" #: ../text.py:407 ../text.py:438 ../text.py:517 ../text.py:545 ../text.py:615 #: ../text.py:639 ../text.py:653 ../text.py:673 ../text.py:686 ../text.py:698 #: ../text.py:893 ../text.py:897 ../text.py:1087 ../textw/lilo.py:26 -#: ../textw/lilo.py:78 ../textw/packages.py:20 ../textw/packages.py:85 -#: ../textw/packages.py:136 ../textw/partitioning.py:205 ../textw/silo.py:25 +#: ../textw/lilo.py:79 ../textw/packages.py:20 ../textw/packages.py:85 +#: ../textw/packages.py:136 ../textw/partitioning.py:207 ../textw/silo.py:25 #: ../textw/silo.py:86 ../textw/timezone.py:63 ../textw/userauth.py:29 #: ../textw/userauth.py:43 ../textw/userauth.py:48 ../textw/userauth.py:82 #: ../textw/userauth.py:94 ../textw/userauth.py:102 ../textw/userauth.py:111 @@ -180,8 +181,8 @@ msgstr "" msgid "/dev/ttyS3 (COM4 under DOS)" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../text.py:88 ../textw/lilo.py:91 -#: ../textw/lilo.py:150 ../textw/silo.py:118 ../textw/silo.py:175 +#: ../iw/lilo.py:197 ../iw/silo.py:245 ../text.py:88 ../textw/lilo.py:92 +#: ../textw/lilo.py:151 ../textw/silo.py:118 ../textw/silo.py:175 msgid "Device" msgstr "" @@ -192,24 +193,24 @@ msgstr "" #. code to create dialog in gtk+ #: ../libfdisk/fsedit.c:645 ../libfdisk/fsedit.c:652 ../libfdisk/fsedit.c:659 -#: ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:680 ../libfdisk/fsedit.c:690 -#: ../libfdisk/fsedit.c:719 ../libfdisk/fsedit.c:735 ../libfdisk/fsedit.c:1095 -#: ../libfdisk/gnomefsedit.c:679 ../libfdisk/gnomefsedit.c:1049 -#: ../libfdisk/gnomefsedit.c:1075 ../libfdisk/gnomefsedit.c:1093 -#: ../libfdisk/gnomefsedit.c:1298 ../libfdisk/gnomefsedit.c:1392 -#: ../libfdisk/gnomefsedit.c:1410 ../libfdisk/gnomefsedit.c:1648 -#: ../libfdisk/gnomefsedit.c:1883 ../libfdisk/gnomefsedit.c:1891 -#: ../libfdisk/gnomefsedit.c:1905 ../libfdisk/gnomefsedit.c:1916 -#: ../libfdisk/gnomefsedit.c:1923 ../libfdisk/gnomefsedit.c:1938 -#: ../libfdisk/gnomefsedit.c:1947 ../libfdisk/gnomefsedit.c:1986 -#: ../libfdisk/gnomefsedit.c:2147 ../libfdisk/newtfsedit.c:113 +#: ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:694 ../libfdisk/fsedit.c:704 +#: ../libfdisk/fsedit.c:733 ../libfdisk/fsedit.c:749 ../libfdisk/fsedit.c:1109 +#: ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1047 +#: ../libfdisk/gnomefsedit.c:1073 ../libfdisk/gnomefsedit.c:1091 +#: ../libfdisk/gnomefsedit.c:1296 ../libfdisk/gnomefsedit.c:1390 +#: ../libfdisk/gnomefsedit.c:1408 ../libfdisk/gnomefsedit.c:1646 +#: ../libfdisk/gnomefsedit.c:1881 ../libfdisk/gnomefsedit.c:1889 +#: ../libfdisk/gnomefsedit.c:1903 ../libfdisk/gnomefsedit.c:1914 +#: ../libfdisk/gnomefsedit.c:1921 ../libfdisk/gnomefsedit.c:1936 +#: ../libfdisk/gnomefsedit.c:1945 ../libfdisk/gnomefsedit.c:1984 +#: ../libfdisk/gnomefsedit.c:2145 ../libfdisk/newtfsedit.c:113 #: ../libfdisk/newtfsedit.c:462 ../libfdisk/newtfsedit.c:540 #: ../libfdisk/newtfsedit.c:558 ../libfdisk/newtfsedit.c:576 #: ../libfdisk/newtfsedit.c:1292 ../libfdisk/newtfsedit.c:1300 #: ../libfdisk/newtfsedit.c:1425 ../libfdisk/newtfsedit.c:1446 #: ../libfdisk/newtfsedit.c:1540 ../loader/urls.c:217 ../text.py:90 -#: ../text.py:557 ../textw/constants.py:10 ../textw/lilo.py:96 -#: ../textw/lilo.py:109 ../textw/lilo.py:159 ../textw/silo.py:123 +#: ../text.py:557 ../textw/constants.py:10 ../textw/lilo.py:97 +#: ../textw/lilo.py:110 ../textw/lilo.py:160 ../textw/silo.py:123 #: ../textw/silo.py:136 ../textw/silo.py:184 msgid "Ok" msgstr "" @@ -285,25 +286,25 @@ msgid "" "like to customize the set of packages that will be upgraded?" msgstr "" -#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/gnomefsedit.c:1005 -#: ../libfdisk/gnomefsedit.c:1111 ../libfdisk/gnomefsedit.c:2039 -#: ../libfdisk/gnomefsedit.c:2309 ../libfdisk/gnomefsedit.c:2362 -#: ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 -#: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 -#: ../libfdisk/newtfsedit.c:1581 ../loader/loader.c:603 ../loader/net.c:703 -#: ../text.py:272 ../text.py:449 ../text.py:467 ../text.py:474 -#: ../textw/partitioning.py:170 +#: ../libfdisk/fsedit.c:677 ../libfdisk/gnomefsedit.c:602 +#: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 +#: ../libfdisk/gnomefsedit.c:2037 ../libfdisk/gnomefsedit.c:2307 +#: ../libfdisk/gnomefsedit.c:2360 ../libfdisk/newtfsedit.c:499 +#: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1478 +#: ../libfdisk/newtfsedit.c:1496 ../libfdisk/newtfsedit.c:1581 +#: ../loader/loader.c:603 ../loader/net.c:703 ../text.py:272 ../text.py:449 +#: ../text.py:467 ../text.py:474 ../textw/partitioning.py:172 msgid "Yes" msgstr "" -#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/gnomefsedit.c:1005 -#: ../libfdisk/gnomefsedit.c:1111 ../libfdisk/gnomefsedit.c:2039 -#: ../libfdisk/gnomefsedit.c:2309 ../libfdisk/gnomefsedit.c:2362 -#: ../libfdisk/newtfsedit.c:499 ../libfdisk/newtfsedit.c:692 -#: ../libfdisk/newtfsedit.c:1478 ../libfdisk/newtfsedit.c:1496 -#: ../libfdisk/newtfsedit.c:1581 ../loader/net.c:703 ../text.py:272 -#: ../text.py:277 ../text.py:449 ../text.py:467 ../text.py:477 -#: ../textw/partitioning.py:170 +#: ../libfdisk/fsedit.c:677 ../libfdisk/gnomefsedit.c:602 +#: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1109 +#: ../libfdisk/gnomefsedit.c:2037 ../libfdisk/gnomefsedit.c:2307 +#: ../libfdisk/gnomefsedit.c:2360 ../libfdisk/newtfsedit.c:499 +#: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1478 +#: ../libfdisk/newtfsedit.c:1496 ../libfdisk/newtfsedit.c:1581 +#: ../loader/net.c:703 ../text.py:272 ../text.py:277 ../text.py:449 +#: ../text.py:467 ../text.py:477 ../textw/partitioning.py:172 msgid "No" msgstr "" @@ -560,11 +561,11 @@ msgstr "" msgid "SILO Configuration" msgstr "" -#: ../text.py:982 ../textw/lilo.py:29 ../textw/lilo.py:75 ../textw/lilo.py:168 +#: ../text.py:982 ../textw/lilo.py:29 ../textw/lilo.py:76 ../textw/lilo.py:169 msgid "LILO Configuration" msgstr "" -#: ../iw/lilo.py:97 ../iw/lilo.py:202 ../iw/silo.py:125 ../iw/silo.py:268 +#: ../iw/lilo.py:104 ../iw/lilo.py:219 ../iw/silo.py:125 ../iw/silo.py:268 #: ../text.py:986 ../text.py:992 msgid "Partition" msgstr "" @@ -645,97 +646,102 @@ msgstr "" msgid "I can't go to the previous step from here. You will have to try again." msgstr "" -#: ../todo.py:523 +#: ../todo.py:341 +#, c-format +msgid "Error copying file: %s" +msgstr "" + +#: ../todo.py:480 msgid "Creating boot disk..." msgstr "" -#: ../todo.py:668 +#: ../todo.py:627 msgid "Reading" msgstr "" -#: ../todo.py:669 +#: ../todo.py:628 msgid "Reading package information..." msgstr "" -#: ../todo.py:837 ../todo.py:847 +#: ../todo.py:796 ../todo.py:806 msgid "no suggestion" msgstr "" -#: ../todo.py:853 +#: ../todo.py:812 msgid "Searching" msgstr "" -#: ../todo.py:854 +#: ../todo.py:813 msgid "Searching for Red Hat Linux installations..." msgstr "" -#: ../todo.py:881 +#: ../todo.py:824 ../todo.py:853 #, c-format msgid "Error mounting ext2 filesystem on %s: %s" msgstr "" -#: ../todo.py:900 +#: ../todo.py:872 msgid "Finding" msgstr "" -#: ../todo.py:901 +#: ../todo.py:873 msgid "Finding packages to upgrade..." msgstr "" -#: ../todo.py:1084 +#: ../todo.py:1056 msgid "Processing" msgstr "" -#: ../todo.py:1085 +#: ../todo.py:1057 msgid "Preparing to install..." msgstr "" -#: ../todo.py:1201 +#: ../todo.py:1171 msgid "Rebuilding" msgstr "" -#: ../todo.py:1202 +#: ../todo.py:1172 msgid "Rebuilding RPM database..." msgstr "" -#: ../todo.py:1207 +#: ../todo.py:1177 msgid "Rebuild of RPM database failed. You may be out of disk space?" msgstr "" -#: ../todo.py:1257 +#: ../todo.py:1227 #, c-format msgid "Upgrading %s.\n" msgstr "" -#: ../todo.py:1259 +#: ../todo.py:1229 #, c-format msgid "Installing %s.\n" msgstr "" -#: ../todo.py:1280 +#: ../todo.py:1250 msgid "" "You don't appear to have enough disk space to install the packages you've " "selected. You need more space on the following filesystems:\n" "\n" msgstr "" -#: ../todo.py:1283 +#: ../todo.py:1253 msgid "Mount Point" msgstr "" -#: ../todo.py:1283 +#: ../todo.py:1253 msgid "Space Needed" msgstr "" -#: ../todo.py:1297 +#: ../todo.py:1267 msgid "Disk Space" msgstr "" -#: ../todo.py:1319 +#: ../todo.py:1289 msgid "Post Install" msgstr "" -#: ../todo.py:1320 +#: ../todo.py:1290 msgid "Performing post install configuration..." msgstr "" @@ -805,7 +811,7 @@ msgid "Add" msgstr "" #: ../iw/account.py:207 ../libfdisk/newtfsedit.c:1291 -#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:159 ../textw/lilo.py:181 +#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:160 ../textw/lilo.py:182 #: ../textw/partitioning.py:62 ../textw/silo.py:184 ../textw/silo.py:206 #: ../textw/userauth.py:172 msgid "Edit" @@ -937,8 +943,8 @@ msgstr "" msgid "KDE Workstation" msgstr "" -#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2215 -#: ../libfdisk/gnomefsedit.c:2235 +#: ../iw/installpath.py:42 ../libfdisk/gnomefsedit.c:2213 +#: ../libfdisk/gnomefsedit.c:2233 msgid "Server" msgstr "" @@ -950,15 +956,15 @@ msgstr "" msgid "Install Type" msgstr "" -#: ../iw/installpath.py:172 +#: ../iw/installpath.py:173 msgid "Install" msgstr "" -#: ../iw/installpath.py:174 +#: ../iw/installpath.py:175 msgid "Upgrade" msgstr "" -#: ../iw/installpath.py:227 +#: ../iw/installpath.py:228 msgid "Use fdisk" msgstr "" @@ -990,50 +996,50 @@ msgstr "" msgid "Lilo Configuration" msgstr "" -#: ../iw/lilo.py:102 ../iw/lilo.py:203 ../iw/silo.py:130 ../iw/silo.py:269 +#: ../iw/lilo.py:109 ../iw/lilo.py:220 ../iw/silo.py:130 ../iw/silo.py:269 msgid "Type" msgstr "" -#: ../iw/lilo.py:131 +#: ../iw/lilo.py:140 msgid "Install LILO boot record on:" msgstr "" -#: ../iw/lilo.py:136 ../iw/silo.py:166 ../textw/silo.py:60 +#: ../iw/lilo.py:147 ../iw/silo.py:166 ../textw/silo.py:60 msgid "Master Boot Record (MBR)" msgstr "" -#: ../iw/lilo.py:140 ../iw/silo.py:169 ../textw/silo.py:61 +#: ../iw/lilo.py:151 ../iw/silo.py:169 ../textw/silo.py:61 msgid "First sector of boot partition" msgstr "" -#: ../iw/lilo.py:144 ../textw/lilo.py:20 +#: ../iw/lilo.py:155 ../textw/lilo.py:20 msgid "Use linear mode (needed for some SCSI drives)" msgstr "" -#: ../iw/lilo.py:148 ../iw/silo.py:196 +#: ../iw/lilo.py:165 ../iw/silo.py:196 msgid "Kernel parameters" msgstr "" -#: ../iw/lilo.py:165 ../iw/silo.py:214 +#: ../iw/lilo.py:182 ../iw/silo.py:214 msgid "Create boot disk" msgstr "" -#: ../iw/lilo.py:169 +#: ../iw/lilo.py:186 msgid "Do not install LILO" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:150 +#: ../iw/lilo.py:197 ../iw/silo.py:245 ../textw/lilo.py:151 #: ../textw/silo.py:175 msgid "Default" msgstr "" -#: ../iw/lilo.py:180 ../iw/silo.py:245 ../textw/lilo.py:150 +#: ../iw/lilo.py:197 ../iw/silo.py:245 ../textw/lilo.py:151 #: ../textw/silo.py:175 msgid "Partition type" msgstr "" -#: ../iw/lilo.py:180 ../iw/lilo.py:214 ../iw/silo.py:245 ../iw/silo.py:280 -#: ../textw/lilo.py:92 ../textw/lilo.py:150 ../textw/silo.py:119 +#: ../iw/lilo.py:197 ../iw/lilo.py:231 ../iw/silo.py:245 ../iw/silo.py:280 +#: ../textw/lilo.py:93 ../textw/lilo.py:151 ../textw/silo.py:119 #: ../textw/silo.py:175 msgid "Boot label" msgstr "" @@ -1158,22 +1164,22 @@ msgstr "" msgid "Disk Druid" msgstr "" -#: ../iw/rootpartition.py:43 ../textw/partitioning.py:165 +#: ../iw/rootpartition.py:43 ../textw/partitioning.py:167 msgid "Low Memory" msgstr "" -#: ../iw/rootpartition.py:44 ../textw/partitioning.py:166 +#: ../iw/rootpartition.py:44 ../textw/partitioning.py:168 msgid "" "As you don't have much memory in this machine, we need to turn on swap space " "immediately. To do this we'll have to write your new partition table to the " "disk immediately. Is that okay?" msgstr "" -#: ../iw/rootpartition.py:98 ../textw/partitioning.py:120 +#: ../iw/rootpartition.py:98 ../textw/partitioning.py:121 msgid "Automatic Partitioning" msgstr "" -#: ../iw/rootpartition.py:164 ../textw/partitioning.py:121 +#: ../iw/rootpartition.py:164 ../textw/partitioning.py:122 #, c-format msgid "" "%s\n" @@ -1187,7 +1193,7 @@ msgstr "" msgid "Remove data" msgstr "" -#: ../iw/rootpartition.py:181 ../textw/partitioning.py:125 +#: ../iw/rootpartition.py:181 ../textw/partitioning.py:126 msgid "Manually partition" msgstr "" @@ -1215,23 +1221,23 @@ msgstr "" msgid "Time Zone Selection" msgstr "" -#: ../iw/timezone.py:154 +#: ../iw/timezone.py:143 msgid "View:" msgstr "" -#: ../iw/timezone.py:162 ../iw/timezone.py:163 +#: ../iw/timezone.py:151 ../iw/timezone.py:152 msgid "System clock uses UTC" msgstr "" -#: ../iw/timezone.py:211 +#: ../iw/timezone.py:200 msgid "Use Daylight Saving Time (US only)" msgstr "" -#: ../iw/timezone.py:225 +#: ../iw/timezone.py:214 msgid "Location" msgstr "" -#: ../iw/timezone.py:226 +#: ../iw/timezone.py:215 msgid "UTC Offset" msgstr "" @@ -1290,28 +1296,28 @@ msgid "" "blank." msgstr "" -#: ../textw/lilo.py:76 ../textw/silo.py:90 +#: ../textw/lilo.py:77 ../textw/silo.py:90 msgid "Where do you want to install the bootloader?" msgstr "" -#: ../textw/lilo.py:96 ../textw/lilo.py:117 ../textw/silo.py:123 +#: ../textw/lilo.py:97 ../textw/lilo.py:118 ../textw/silo.py:123 #: ../textw/silo.py:144 msgid "Clear" msgstr "" -#: ../libfdisk/gnomefsedit.c:679 ../libfdisk/gnomefsedit.c:1648 -#: ../libfdisk/gnomefsedit.c:2147 ../libfdisk/newtfsedit.c:463 +#: ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1646 +#: ../libfdisk/gnomefsedit.c:2145 ../libfdisk/newtfsedit.c:463 #: ../libfdisk/newtfsedit.c:1496 ../loader/devices.c:168 -#: ../loader/loader.c:1730 ../textw/lilo.py:96 ../textw/lilo.py:114 +#: ../loader/loader.c:1730 ../textw/lilo.py:97 ../textw/lilo.py:115 #: ../textw/silo.py:123 ../textw/silo.py:141 ../textw/userauth.py:62 msgid "Cancel" msgstr "" -#: ../textw/lilo.py:104 ../textw/silo.py:131 +#: ../textw/lilo.py:105 ../textw/silo.py:131 msgid "Edit Boot Label" msgstr "" -#: ../textw/lilo.py:163 ../textw/silo.py:187 +#: ../textw/lilo.py:164 ../textw/silo.py:187 msgid "" "The boot manager Red Hat uses can boot other operating systems as well. You " "need to tell me what partitions you would like to be able to boot and what " @@ -1350,11 +1356,11 @@ msgstr "" msgid "Done" msgstr "" -#: ../textw/partitioning.py:125 ../textw/partitioning.py:126 +#: ../textw/partitioning.py:126 ../textw/partitioning.py:127 msgid "Continue" msgstr "" -#: ../textw/partitioning.py:185 +#: ../textw/partitioning.py:187 msgid "" "What partitions would you like to format? We strongly suggest formatting all " "of the system partitions, including /, /usr, and /var. There is no need to " @@ -1362,11 +1368,11 @@ msgid "" "previous install." msgstr "" -#: ../textw/partitioning.py:202 +#: ../textw/partitioning.py:204 msgid "Check for bad blocks during format" msgstr "" -#: ../textw/partitioning.py:207 +#: ../textw/partitioning.py:209 msgid "Choose Partitions to Format" msgstr "" @@ -1492,7 +1498,7 @@ msgid "Request server via broadcast" msgstr "" #: ../libfdisk/fsedit.c:645 ../libfdisk/fsedit.c:652 ../libfdisk/fsedit.c:659 -#: ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:680 ../libfdisk/fsedit.c:690 +#: ../libfdisk/fsedit.c:668 ../libfdisk/fsedit.c:694 ../libfdisk/fsedit.c:704 msgid "Bad Mount Point" msgstr "" @@ -1525,7 +1531,15 @@ msgid "" "Mount points may only printable characters." msgstr "" -#: ../libfdisk/fsedit.c:681 +#: ../libfdisk/fsedit.c:678 +msgid "" +"You've asked to put your root (/) filesystem on a DOS-style FAT partition. " +"You can do this, but you may not use any other filesystems for your Linux " +"system. Additionally, there will be a speed penalty for not using " +"Linux-native partitions. Do you want to continue?" +msgstr "" + +#: ../libfdisk/fsedit.c:695 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1533,7 +1547,7 @@ msgid "" "System partitions must be on Linux Native partitions." msgstr "" -#: ../libfdisk/fsedit.c:691 +#: ../libfdisk/fsedit.c:705 #, c-format msgid "" "The mount point %s is illegal.\n" @@ -1541,174 +1555,174 @@ msgid "" "/usr must be on a Linux Native partition or an NFS volume." msgstr "" -#: ../libfdisk/fsedit.c:719 +#: ../libfdisk/fsedit.c:733 msgid "Too Many Drives" msgstr "" -#: ../libfdisk/fsedit.c:720 +#: ../libfdisk/fsedit.c:734 msgid "" "You have more drives than this program supports. Please use the standard " "fdisk program to setup your drives and please notify Red Hat Software that " "you saw this message." msgstr "" -#: ../libfdisk/fsedit.c:735 +#: ../libfdisk/fsedit.c:749 msgid "No Drives Found" msgstr "" -#: ../libfdisk/fsedit.c:736 +#: ../libfdisk/fsedit.c:750 msgid "" "An error has occurred - no valid devices were found on which to create new " "filesystems. Please check your hardware for the cause of this problem." msgstr "" -#: ../libfdisk/fsedit.c:1009 ../libfdisk/fsedit.c:1079 +#: ../libfdisk/fsedit.c:1023 ../libfdisk/fsedit.c:1093 #, c-format msgid "" "An error occurred reading the partition table for the block device %s. The " "error was" msgstr "" -#: ../libfdisk/fsedit.c:1052 +#: ../libfdisk/fsedit.c:1066 #, c-format msgid "" "The partition table on device %s is corrupted. To create new partitions it " "must be initialized, causing the loss of ALL DATA on this drive." msgstr "" -#: ../libfdisk/fsedit.c:1057 +#: ../libfdisk/fsedit.c:1071 msgid "Bad Partition Table" msgstr "" -#: ../libfdisk/fsedit.c:1058 +#: ../libfdisk/fsedit.c:1072 msgid "Initialize" msgstr "" -#: ../libfdisk/fsedit.c:1058 ../libfdisk/fsedit.c:1083 +#: ../libfdisk/fsedit.c:1072 ../libfdisk/fsedit.c:1097 msgid "Skip Drive" msgstr "" -#: ../libfdisk/fsedit.c:1083 ../loader/net.c:329 +#: ../libfdisk/fsedit.c:1097 ../loader/net.c:329 msgid "Retry" msgstr "" -#: ../libfdisk/fsedit.c:1095 +#: ../libfdisk/fsedit.c:1109 msgid "BSD Disklabel" msgstr "" -#: ../libfdisk/fsedit.c:1095 +#: ../libfdisk/fsedit.c:1109 msgid "" "A disk with a BSD disklabel has been found. The Red Hat installation only " "supports BSD Disklabels in read-only mode, so you must use a custom install " "and fdisk (instead of Disk Druid) for machines with BSD Disklabels." msgstr "" -#: ../libfdisk/fsedit.c:1125 +#: ../libfdisk/fsedit.c:1139 #, c-format msgid "System error %d" msgstr "" -#: ../libfdisk/fsedit.c:1134 ../libfdisk/fsedit.c:1136 +#: ../libfdisk/fsedit.c:1148 ../libfdisk/fsedit.c:1150 msgid "Fdisk Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:522 ../libfdisk/gnomefsedit.c:718 +#: ../libfdisk/gnomefsedit.c:520 ../libfdisk/gnomefsedit.c:716 msgid "" msgstr "" -#: ../libfdisk/gnomefsedit.c:530 ../libfdisk/gnomefsedit.c:720 +#: ../libfdisk/gnomefsedit.c:528 ../libfdisk/gnomefsedit.c:718 msgid "" msgstr "" -#: ../libfdisk/gnomefsedit.c:604 ../libfdisk/newtfsedit.c:692 +#: ../libfdisk/gnomefsedit.c:602 ../libfdisk/newtfsedit.c:692 msgid "Delete Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:605 ../libfdisk/newtfsedit.c:693 +#: ../libfdisk/gnomefsedit.c:603 ../libfdisk/newtfsedit.c:693 msgid "Are you sure you want to delete this partition?" msgstr "" -#: ../libfdisk/gnomefsedit.c:663 ../libfdisk/gnomefsedit.c:669 -#: ../libfdisk/gnomefsedit.c:673 ../libfdisk/gnomefsedit.c:675 +#: ../libfdisk/gnomefsedit.c:661 ../libfdisk/gnomefsedit.c:667 +#: ../libfdisk/gnomefsedit.c:671 ../libfdisk/gnomefsedit.c:673 #: ../libfdisk/newtfsedit.c:260 ../libfdisk/newtfsedit.c:266 #: ../libfdisk/newtfsedit.c:270 ../libfdisk/newtfsedit.c:272 msgid "Edit Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:690 ../libfdisk/gnomefsedit.c:1657 +#: ../libfdisk/gnomefsedit.c:688 ../libfdisk/gnomefsedit.c:1655 msgid "Mount Point:" msgstr "" -#: ../libfdisk/gnomefsedit.c:733 +#: ../libfdisk/gnomefsedit.c:731 msgid "Size (Megs):" msgstr "" -#: ../libfdisk/gnomefsedit.c:764 +#: ../libfdisk/gnomefsedit.c:762 msgid "Grow to fill disk?" msgstr "" -#: ../libfdisk/gnomefsedit.c:783 ../libfdisk/newtfsedit.c:332 +#: ../libfdisk/gnomefsedit.c:781 ../libfdisk/newtfsedit.c:332 msgid "Allocation Status:" msgstr "" -#: ../libfdisk/gnomefsedit.c:787 ../libfdisk/newtfsedit.c:334 +#: ../libfdisk/gnomefsedit.c:785 ../libfdisk/newtfsedit.c:334 msgid "Successful" msgstr "" -#: ../libfdisk/gnomefsedit.c:790 ../libfdisk/newtfsedit.c:336 +#: ../libfdisk/gnomefsedit.c:788 ../libfdisk/newtfsedit.c:336 msgid "Failed" msgstr "" -#: ../libfdisk/gnomefsedit.c:802 ../libfdisk/newtfsedit.c:341 +#: ../libfdisk/gnomefsedit.c:800 ../libfdisk/newtfsedit.c:341 msgid "Failure Reason:" msgstr "" -#: ../libfdisk/gnomefsedit.c:816 ../libfdisk/gnomefsedit.c:1691 +#: ../libfdisk/gnomefsedit.c:814 ../libfdisk/gnomefsedit.c:1689 msgid "Partition Type:" msgstr "" -#: ../libfdisk/gnomefsedit.c:899 +#: ../libfdisk/gnomefsedit.c:897 msgid "Allowable Drives:" msgstr "" -#: ../libfdisk/gnomefsedit.c:1005 ../libfdisk/gnomefsedit.c:1883 +#: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1881 #: ../libfdisk/newtfsedit.c:499 msgid "No Mount Point" msgstr "" -#: ../libfdisk/gnomefsedit.c:1006 ../libfdisk/newtfsedit.c:500 +#: ../libfdisk/gnomefsedit.c:1004 ../libfdisk/newtfsedit.c:500 msgid "" "You have not selected a mount point for this partition. Are you sure you " "want to do this?" msgstr "" -#: ../libfdisk/gnomefsedit.c:1049 ../libfdisk/gnomefsedit.c:1891 +#: ../libfdisk/gnomefsedit.c:1047 ../libfdisk/gnomefsedit.c:1889 #: ../libfdisk/newtfsedit.c:540 msgid "Mount Point Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1050 ../libfdisk/newtfsedit.c:541 +#: ../libfdisk/gnomefsedit.c:1048 ../libfdisk/newtfsedit.c:541 msgid "" "The mount point requested is either an illegal path or is already in use. " "Please select a valid mount point." msgstr "" -#: ../libfdisk/gnomefsedit.c:1075 ../libfdisk/newtfsedit.c:558 +#: ../libfdisk/gnomefsedit.c:1073 ../libfdisk/newtfsedit.c:558 msgid "Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1076 ../libfdisk/newtfsedit.c:559 +#: ../libfdisk/gnomefsedit.c:1074 ../libfdisk/newtfsedit.c:559 msgid "" "The size requested is illegal. Make sure the size is greater and zero (0), " "and is specified int decimal (base 10) format." msgstr "" -#: ../libfdisk/gnomefsedit.c:1093 ../libfdisk/gnomefsedit.c:1986 +#: ../libfdisk/gnomefsedit.c:1091 ../libfdisk/gnomefsedit.c:1984 #: ../libfdisk/newtfsedit.c:576 msgid "Swap Size Error" msgstr "" -#: ../libfdisk/gnomefsedit.c:1094 ../libfdisk/gnomefsedit.c:1987 +#: ../libfdisk/gnomefsedit.c:1092 ../libfdisk/gnomefsedit.c:1985 #: ../libfdisk/newtfsedit.c:577 #, c-format msgid "" @@ -1716,22 +1730,22 @@ msgid "" "swap partition is %ld Megabytes." msgstr "" -#: ../libfdisk/gnomefsedit.c:1110 ../libfdisk/gnomefsedit.c:1117 +#: ../libfdisk/gnomefsedit.c:1108 ../libfdisk/gnomefsedit.c:1115 msgid "No RAID Drive Constraint" msgstr "" -#: ../libfdisk/gnomefsedit.c:1112 +#: ../libfdisk/gnomefsedit.c:1110 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive.\n" " Are you sure you want to do this?" msgstr "" -#: ../libfdisk/gnomefsedit.c:1118 +#: ../libfdisk/gnomefsedit.c:1116 msgid "Close" msgstr "" -#: ../libfdisk/gnomefsedit.c:1119 +#: ../libfdisk/gnomefsedit.c:1117 msgid "" "You have configured a RAID partition without constraining the partition to a " "single drive. Please select one drive to constrain this partition to." @@ -1739,11 +1753,11 @@ msgstr "" #. XXXXX - for now destroy the raid entry since it #. now contains unallocated partitions! -#: ../libfdisk/gnomefsedit.c:1298 +#: ../libfdisk/gnomefsedit.c:1296 msgid "RAID Entry Incomplete" msgstr "" -#: ../libfdisk/gnomefsedit.c:1299 +#: ../libfdisk/gnomefsedit.c:1297 #, c-format msgid "" "The raid device /dev/%s now contains partitions which are unallocated. The " @@ -1752,12 +1766,12 @@ msgid "" msgstr "" #. build list of why they all failed -#: ../libfdisk/gnomefsedit.c:1392 ../libfdisk/gnomefsedit.c:1411 +#: ../libfdisk/gnomefsedit.c:1390 ../libfdisk/gnomefsedit.c:1409 #: ../libfdisk/newtfsedit.c:81 ../libfdisk/newtfsedit.c:1477 msgid "Unallocated Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:1396 ../libfdisk/gnomefsedit.c:1406 +#: ../libfdisk/gnomefsedit.c:1394 ../libfdisk/gnomefsedit.c:1404 #: ../libfdisk/newtfsedit.c:85 msgid "" "There are currently unallocated partition(s) present in the list of " @@ -1765,80 +1779,80 @@ msgid "" "with the reason they were not allocated." msgstr "" -#: ../libfdisk/gnomefsedit.c:1677 +#: ../libfdisk/gnomefsedit.c:1675 msgid "" msgstr "" -#: ../libfdisk/gnomefsedit.c:2401 +#: ../libfdisk/gnomefsedit.c:2399 msgid "" msgstr "" -#: ../libfdisk/gnomefsedit.c:2403 +#: ../libfdisk/gnomefsedit.c:2401 msgid "" msgstr "" -#: ../libfdisk/gnomefsedit.c:3069 +#: ../libfdisk/gnomefsedit.c:3085 msgid "Unallocated Partitions Exist..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3075 ../libfdisk/gnomefsedit.c:3089 +#: ../libfdisk/gnomefsedit.c:3091 ../libfdisk/gnomefsedit.c:3105 msgid "" "You must assign a root (/) partition to a Linux native partition (ext2) or a " "RAID partition for the install to proceed." msgstr "" -#: ../libfdisk/gnomefsedit.c:3163 +#: ../libfdisk/gnomefsedit.c:3179 msgid "Partitions" msgstr "" -#: ../libfdisk/gnomefsedit.c:3207 +#: ../libfdisk/gnomefsedit.c:3223 msgid "_Add..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3219 +#: ../libfdisk/gnomefsedit.c:3235 msgid "_Edit..." msgstr "" -#: ../libfdisk/gnomefsedit.c:3220 +#: ../libfdisk/gnomefsedit.c:3236 msgid "_Delete" msgstr "" -#: ../libfdisk/gnomefsedit.c:3221 +#: ../libfdisk/gnomefsedit.c:3237 msgid "_Reset" msgstr "" -#: ../libfdisk/gnomefsedit.c:3250 +#: ../libfdisk/gnomefsedit.c:3266 msgid "_Make RAID Device" msgstr "" -#: ../libfdisk/gnomefsedit.c:3259 +#: ../libfdisk/gnomefsedit.c:3275 msgid "Auto Partition" msgstr "" -#: ../libfdisk/gnomefsedit.c:3272 +#: ../libfdisk/gnomefsedit.c:3288 msgid "Drive Summary" msgstr "" diff --git a/todo.py b/todo.py index cd0e7268b..590ea2dff 100644 --- a/todo.py +++ b/todo.py @@ -18,25 +18,12 @@ from simpleconfig import SimpleConfigFile from mouse import Mouse from xf86config import XF86Config import errno +import raid +import fstab def _(x): return x -class FakeDDruid: - """A disk druid looking thing for upgrades""" - def partitionList (self): - return (self.partitions, None) - - def append (self, name, table): - for i in range (len (table)): - (type, sector, size) = table[i] - if size and type != -1: - self.partitions.append ((name + str (i + 1)), - "Existing000" + str(len (self.partitions)), - type, sector, size) - def __init__ (self): - self.partitions = [] - class LogFile: def __init__ (self, serial, reconfigOnly, test): if serial or reconfigOnly: @@ -449,33 +436,6 @@ class ToDo: reformat = 1 self.mounts[location] = (device, fsystem, reformat) - def readFstab (self, path): - f = open (path, "r") - lines = f.readlines () - f.close - fstab = {} - for line in lines: - fields = string.split (line) - # skip comments - if fields and fields[0][0] == '#': - continue - if not fields: continue - # all valid fstab entries have 6 fields - if len (fields) < 4 or len (fields) > 6: continue - - if fields[2] != "ext2" and fields[2] != "swap": continue - if string.find(fields[3], "noauto") != -1: continue - if (fields[0][0:7] != "/dev/hd" and - fields[0][0:7] != "/dev/sd" and - fields[0][0:8] != "/dev/rd/" and - fields[0][0:9] != "/dev/ida/"): continue - - format = 0 - # XXX always format swap. - if fields[2] == "swap": format = 1 - fstab[fields[1]] = (fields[0][5:], fields[2], format) - return fstab - def writeLanguage(self): f = open(self.instPath + "/etc/sysconfig/i18n", "w") f.write(str (self.language)) @@ -853,7 +813,21 @@ class ToDo: _("Searching for Red Hat Linux installations...")) drives = self.drives.available ().keys () - self.ddruid = FakeDDruid () + mdList = raid.startAllRaid(drives) + + for dev in mdList: + isys.makeDevInode(dev, '/tmp/' + dev) + try: + isys.mount('/tmp/' + dev, '/mnt/sysimage') + except SystemError, (errno, msg): + self.intf.messageWindow(_("Error"), + _("Error mounting ext2 filesystem on %s: %s") % (dev, msg)) + continue + if os.access ('/mnt/sysimage/etc/fstab', os.R_OK): + rootparts.append (dev) + isys.umount('/mnt/sysimage') + os.remove ('/tmp/' + dev) + for drive in drives: isys.makeDevInode(drive, '/tmp/' + drive) @@ -862,7 +836,6 @@ class ToDo: except SystemError: pass else: - self.ddruid.append (drive, table) for i in range (len (table)): (type, sector, size) = table[i] # 2 is ext2 in balkan speek @@ -903,11 +876,11 @@ class ToDo: if self.setupFilesystems: isys.makeDevInode(root, '/tmp/' + root) isys.mount('/tmp/' + root, '/mnt/sysimage') - self.mounts = self.readFstab ('/mnt/sysimage/etc/fstab') + fstab.readFstab('/mnt/sysimage/etc/fstab', self.fstab) isys.umount('/mnt/sysimage') - self.mountFilesystems () + self.fstab.mountFilesystems (self.instPath) packages = rpm.findUpgradeSet (self.hdList.hdlist, self.instPath) - self.umountFilesystems () + self.fstab.umountFilesystems (self.instPath) # unselect all packages for package in self.hdList.packages.values (): @@ -1191,8 +1164,6 @@ class ToDo: self.fstab.savePartitions () self.fstab.turnOnSwap() self.fstab.makeFilesystems () - else: - (drives, raid) = self.ddruid.partitionList() self.fstab.mountFilesystems (self.instPath) -- cgit