diff options
| -rw-r--r-- | livecd.py | 6 | ||||
| -rw-r--r-- | rescue.py | 6 | ||||
| -rw-r--r-- | upgrade.py | 2 | ||||
| -rw-r--r-- | yuminstall.py | 8 |
4 files changed, 2 insertions, 20 deletions
@@ -136,7 +136,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): def _unmountNonFstabDirs(self, anaconda): # unmount things that aren't listed in /etc/fstab. *sigh* - dirs = ["/dev"] + dirs = [] if flags.selinux: dirs.append("/selinux") for dir in dirs: @@ -152,13 +152,12 @@ class LiveCDCopyBackend(backend.AnacondaBackend): swapoff = False) os.rmdir(anaconda.rootPath) except Exception, e: - log.error("Unable to unmount filesystems.") + log.error("Unable to unmount filesystems: %s" % e) def doPreInstall(self, anaconda): if anaconda.dir == DISPATCH_BACK: self._unmountNonFstabDirs(anaconda) return - anaconda.id.storage.fsset.umountFilesystems(anaconda.rootPath, swapoff = False) @@ -312,7 +311,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend): isys.mount("/selinux", anaconda.rootPath + "/selinux", "selinuxfs") except Exception, e: log.error("error mounting selinuxfs: %s" %(e,)) - isys.mount("/dev", "%s/dev" %(anaconda.rootPath,), bindMount = True) wait.pop() @@ -331,12 +331,6 @@ def runRescue(anaconda, instClass): except: log.error("Error enabling swap") - # now that dev is udev, bind mount the installer dev there - isys.mount("/dev", "%s/dev" %(anaconda.rootPath,), bindMount = True) - - # and /dev/pts - isys.mount("/dev/pts", "%s/dev/pts" %(anaconda.rootPath,), bindMount = True) - # and /selinux too if flags.selinux and os.path.isdir("%s/selinux" %(anaconda.rootPath,)): try: diff --git a/upgrade.py b/upgrade.py index 7cb2f5dab..c080c8651 100644 --- a/upgrade.py +++ b/upgrade.py @@ -277,8 +277,6 @@ def upgradeMountFilesystems(anaconda): message = message + '\t' + n + '\n' anaconda.intf.messageWindow(_("Invalid Directories"), message) sys.exit(0) - - bindMountDevDirectory(anaconda.rootPath) else: if not os.access (anaconda.rootPath + "/etc/fstab", os.R_OK): anaconda.intf.messageWindow(_("Warning"), diff --git a/yuminstall.py b/yuminstall.py index 89f36686e..963303256 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1457,14 +1457,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon except Exception, e: log.error("error mounting selinuxfs: %s" %(e,)) - # we need to have a /dev during install and now that udev is - # handling /dev, it gets to be more fun. so just bind mount the - # installer /dev - log.warning("no dev package, going to bind mount /dev") - isys.mount("/dev", "%s/dev" %(anaconda.rootPath,), bindMount = True) - if not upgrade: - anaconda.id.storage.fsset.mkDevRoot(anaconda.rootPath) - # write out the fstab if not upgrade: anaconda.id.storage.fsset.write(anaconda.rootPath) |