arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
baiyuan
2014-10-21 05:18:51 -04:00
parent 9552485df6 5b59d6eddf
commit 79d784a384
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/share/xcat/netboot/ubuntu/genimage
View File

@@ -1752,7 +1752,7 @@ sub mount_chroot {
system("mount -o bind $pkgdir $rootimage_dir/mnt/pkgdir");
if ($otherpkgdir){
if(-d $otherpkgdir){
system("mount -o bind $otherpkgdir $rootimage_dir/mnt/otherpkgdir");
system("mount --rbind $otherpkgdir $rootimage_dir/mnt/otherpkgdir");
}else{
print "The specified otherpkgdir $otherpkgdir does not exist!\n"
}
@@ -1765,7 +1765,8 @@ sub umount_chroot {
#system("umount $rootimage_dir/proc");
#system("umount $rootimage_dir/sys");
system("umount $rootimage_dir/mnt/pkgdir");
system("umount $rootimage_dir/mnt/otherpkgdir");
#system("umount $rootimage_dir/mnt/otherpkgdir");
system("grep /mnt/otherpkgdir /proc/mounts | cut -f2 -d' ' | sort -r|xargs umount");
rmdir("$rootimage_dir/mnt/pkgdir");
rmdir("$rootimage_dir/mnt/otherpkgdir");
}