diff options
| -rw-r--r-- | iw/fdisk.py | 4 | ||||
| -rw-r--r-- | iw/rootpartition.py | 6 | ||||
| -rw-r--r-- | todo.py | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/iw/fdisk.py b/iw/fdisk.py index 2c6ee900c..783b64ecd 100644 --- a/iw/fdisk.py +++ b/iw/fdisk.py @@ -38,7 +38,8 @@ class FDiskWindow (InstallWindow): for mntpoint, (dev, fstype, reformat) in self.todo.mounts.items (): fstab.append ((dev, mntpoint)) - self.todo.ddruid = fsedit(0, drives, fstab, self.todo.zeroMbr) + self.todo.ddruid = fsedit(0, drives, fstab, self.todo.zeroMbr, + self.todo.ddruidReadOnly) return None def button_clicked (self, widget, drive): @@ -48,6 +49,7 @@ class FDiskWindow (InstallWindow): # free the file descriptors self.todo.ddruid = None + self.todo.ddruidReadOnly = 1 if os.access("/sbin/fdisk", os.X_OK): path = "/sbin/fdisk" diff --git a/iw/rootpartition.py b/iw/rootpartition.py index f3a0fe94d..e126f0f29 100644 --- a/iw/rootpartition.py +++ b/iw/rootpartition.py @@ -144,7 +144,8 @@ class AutoPartitionWindow(InstallWindow): self.manuallyPartition.get_active()): drives = self.todo.drives.available ().keys () drives.sort (isys.compareDrives) - self.todo.ddruid = fsedit(0, drives, self.fstab, self.todo.zeroMbr) + self.todo.ddruid = fsedit(0, drives, self.fstab, self.todo.zeroMbr, + self.todo.ddruidReadOnly) self.todo.manuallyPartition() return None @@ -171,7 +172,8 @@ class AutoPartitionWindow(InstallWindow): if not todo.ddruid: drives = todo.drives.available ().keys () drives.sort (isys.compareDrives) - todo.ddruid = fsedit(0, drives, self.fstab, self.todo.zeroMbr) + todo.ddruid = fsedit(0, drives, self.fstab, self.todo.zeroMbr, + self.todo.ddruidReadOnly) if not todo.instClass.finishPartitioning(todo.ddruid): self.todo.log ("Autopartitioning FAILED\n") @@ -377,7 +377,8 @@ class ToDo: self.mouse = Mouse () self.keyboard = Keyboard () self.auth = Authentication () - self.ddruid = None; + self.ddruid = None + self.ddruidReadOnly = 0 self.drives = Drives () self.badBlockCheck = 0 self.bootdisk = 0 |