summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2005-04-11 23:12:44 +0000
committerPeter Jones <pjones@redhat.com>2005-04-11 23:12:44 +0000
commit0d04a446f33c1f23d7af22ad76c1123c34ea5d6b (patch)
treebd71a45d8ffb4b9f815f5551dd73d23769437e73
parentbeae88542cf4e13107268f689fb5f1e06137913b (diff)
downloadanaconda-0d04a446f33c1f23d7af22ad76c1123c34ea5d6b.tar.gz
anaconda-0d04a446f33c1f23d7af22ad76c1123c34ea5d6b.tar.xz
anaconda-0d04a446f33c1f23d7af22ad76c1123c34ea5d6b.zip
Make upgrades find their devices.
add to changelog bump version
-rw-r--r--ChangeLog4
-rw-r--r--anaconda.spec5
-rw-r--r--upgrade.py5
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0978d7a2e..cd7cc342a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* language.py (Language.CanonLangNick): Always return some value;
if the input language isn't in the list, use en_US.UTF-8
+ * upgrade.py (bindMountDevDirectory): function that does bind mounting
+ of /dev to /mnt/sysimage/dev, so there are devices there.
+ * upgrade.py (upgradeMountFileSystems): mount dev once we've found
+ the new root directory.
2005-04-11 Jeremy Katz <katzj@redhat.com>
diff --git a/anaconda.spec b/anaconda.spec
index 01204e176..09c9cd959 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 10.2.0.47
+Version: 10.2.0.48
Release: 1
License: GPL
Summary: Graphical system installer
@@ -69,10 +69,11 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
-* Mon Apr 11 2005 Peter Jones <pjones@redhat.com> - XX-XX
+* Mon Apr 11 2005 Peter Jones <pjones@redhat.com> - 10.2.0.48-1
- Typo fixes in gui.py (menthos, #154324)
- Don't try to do early swap in test mode, and use yesno not okcancel (msw)
- If the install language is an unknown locale, use en_US.UTF_8
+- Fix upgrade to make devices available in the changeroot
* Thu Apr 7 2005 Peter Jones <pjones@redhat.com> - 10.2.0.47-1
- put ncurses in the net images, too.
diff --git a/upgrade.py b/upgrade.py
index ba121222d..095a3cd79 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -146,6 +146,10 @@ def mountRootPartition(intf, rootInfo, oldfsset, instPath, allowDirty = 0,
not oldfsset.getEntryByMountPoint("/").fsystem.isMountable()):
raise RuntimeError, "/etc/fstab did not list a fstype for the root partition which we support"
+def bindMountDevDirectory(instPath):
+ fs = fsset.fileSystemTypeGet("bind")
+ fs.mount("/dev", "%s/dev" % (instPath,), bindMount=1)
+
# returns None if no filesystem exist to migrate
def upgradeMigrateFind(dispatch, thefsset):
migents = thefsset.getMigratableEntries()
@@ -313,6 +317,7 @@ def upgradeMountFilesystems(intf, rootInfo, oldfsset, instPath):
intf.messageWindow(_("Invalid Directories"), message)
sys.exit(0)
+ bindMountDevDirectory(instPath)
else:
if not os.access (instPath + "/etc/fstab", os.R_OK):
rc = intf.messageWindow(_("Warning"),