From 774c17827292aaf78a3c09795089661ecff13c84 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 13 Mar 2013 09:54:45 +0000
Subject: [PATCH] Don't mount /proc fs since it will confuse the rpm or scripts
 that they are on diskless nodes.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15475 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/rh/genimage     | 12 ++++++------
 xCAT-server/share/xcat/netboot/ubuntu/genimage |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 9638fe2d9..829b81def 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -360,9 +360,9 @@ unless ($onlyinitrd) {
               }
           }
 
-          # mount /proc file system since several packages need it.
-          print "mount /proc file system\nchroot $rootimg_dir /bin/mount -t proc proc /proc\n";
-          system("chroot $rootimg_dir /bin/mount -t proc proc /proc");
+#          # mount /proc file system since several packages need it.
+#          print "mount /proc file system\nchroot $rootimg_dir /bin/mount -t proc proc /proc\n";
+#          system("chroot $rootimg_dir /bin/mount -t proc proc /proc");
 
           # install extra packages
           my $yumcmd_base = $yumcmd;
@@ -387,9 +387,9 @@ unless ($onlyinitrd) {
 	      print "No Packages marked for install\n";
           }
 
-          # umount /proc file system that just mounted
-          print "umount /proc file system\nchroot $rootimg_dir /bin/umount /proc\n";
-          system("chroot $rootimg_dir /bin/umount /proc");
+#          # umount /proc file system that just mounted
+#          print "umount /proc file system\nchroot $rootimg_dir /bin/umount /proc\n";
+#          system("chroot $rootimg_dir /bin/umount /proc");
 	
           # remove the packages that are specified in the otherpkgs.list files with leading '--'
           if (exists ($extra_hash{$pass}{'POST_REMOVE'})) {
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index b392d4fb7..ec7c268bb 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -1666,7 +1666,7 @@ sub mount_chroot {
    mkdir("$rootimage_dir/mnt/pkgdir");
    mkdir("$rootimage_dir/mnt/otherpkgdir");
    system("mount -o bind /dev $rootimage_dir/dev");
-   system("mount -o bind /proc $rootimage_dir/proc");
+#   system("mount -o bind /proc $rootimage_dir/proc");
    system("mount -o bind /sys $rootimage_dir/sys");
    system("mount -o bind $pkgdir $rootimage_dir/mnt/pkgdir");
    if ($otherpkgdir){
@@ -1677,7 +1677,7 @@ sub mount_chroot {
 sub umount_chroot {
    my $rootimage_dir = shift;
    system("umount $rootimage_dir/dev");
-   system("umount $rootimage_dir/proc");
+#   system("umount $rootimage_dir/proc");
    system("umount $rootimage_dir/sys");
    system("umount $rootimage_dir/mnt/pkgdir");
    system("umount $rootimage_dir/mnt/otherpkgdir");