[Mach-cvs] CVS: mach2/src mach-helper.c,1.27,1.28

[Thomas V. S. <tho...@us...>]

Update of /cvsroot/mach/mach2/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12211/src

Modified Files:
	mach-helper.c 
Log Message:
	* src/mach-helper.c:
	  Allow bind mount of /selinux.
	* scripts/mach.in:
	  Mount and unmount /selinux as well if it exists.  This fixes
	  the build of Flumotion failing because Xvfb does not start up
	  without it.



Index: mach-helper.c
===================================================================
RCS file: /cvsroot/mach/mach2/src/mach-helper.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mach-helper.c	10 Aug 2007 06:54:23 -0000	1.27
--- mach-helper.c	15 Nov 2009 13:26:27 -0000	1.28
***************
*** 266,271 ****
  
  /*
!  * allow bind mounts of the archives dir:
   * mount -o bind (archivesdir) (root)/var/cache/apt/archives
   * allow proc mounts:
   * mount -t proc proc (root)/proc
--- 266,272 ----
  
  /*
!  * allow bind mounts of the archives or selinux dir:
   * mount -o bind (archivesdir) (root)/var/cache/apt/archives
+  * mount -o bind /selinux (root)/selinux
   * allow proc mounts:
   * mount -t proc proc (root)/proc
***************
*** 281,287 ****
    if ((strncmp ("-o", argv[2], 2) == 0) && (strncmp ("bind", argv[3], 4) == 0))
    {
!     /* see if it's the archivesdir */
!     if (strncmp (archivesdir, argv[4], strlen (archivesdir)) != 0)
        error ("%s: mount not allowed", argv[4]);
    }
    else if ((strncmp ("-t", argv[2], 2) == 0) &&
--- 282,291 ----
    if ((strncmp ("-o", argv[2], 2) == 0) && (strncmp ("bind", argv[3], 4) == 0))
    {
!     /* see if it's the archivesdir or selinux */
!     if ((strncmp (archivesdir, argv[4], strlen (archivesdir)) != 0) &&
!         (strncmp ("/selinux", argv[4], strlen ("/selinux")) != 0))
!     {
        error ("%s: mount not allowed", argv[4]);
+     }
    }
    else if ((strncmp ("-t", argv[2], 2) == 0) &&