From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 27 Jun 2006 19:07:04 +0000 (+0000)
Subject: - mount /proc in system image before running yum 2.4, which now
X-Git-Tag: myplc-0_4-rc1~3
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=2d2b15d5cbaafd9652b55b641d571c3e286f30f5

- mount /proc in system image before running yum 2.4, which now
  requires it to be mounted
---

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index bdefca8..55beeb2 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -84,6 +84,7 @@ def Run( vars, log ):
         utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log )
         utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" %
                        SYSIMG_PATH, log )
+        utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
 
         ROOT_MOUNTED= 1
         vars['ROOT_MOUNTED']= 1
@@ -141,6 +142,7 @@ def Run( vars, log ):
         utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log )
     except OSError, e:
         pass
+    utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log )
     utils.sysexec_noerr( "umount -r /dev/planetlab/vservers", log )
     utils.sysexec_noerr( "umount -r /dev/planetlab/root", log )
     utils.sysexec_noerr( "vgchange -an", log )
diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index 9d632cc..d5de397 100644
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -84,6 +84,7 @@ def Run( vars, log ):
             utils.sysexec( "mount /dev/planetlab/root %s" % SYSIMG_PATH, log )
             utils.sysexec( "mount /dev/planetlab/vservers %s/vservers" %
                            SYSIMG_PATH, log )
+            utils.sysexec( "mount -t proc none %s/proc" % SYSIMG_PATH, log )
         except BootManagerException, e:
             log.write( "BootManagerException during vgscan/vgchange: %s\n" %
                        str(e) )