From: Heiko Z. <smi...@us...> - 2008-06-17 22:59:51
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv22564/scripts Modified Files: aufs prepare Log Message: - aufs and grsecurity now work together - updated aufs-20060616 Index: aufs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/aufs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- aufs 30 May 2008 13:46:20 -0000 1.4 +++ aufs 17 Jun 2008 22:59:46 -0000 1.5 @@ -27,7 +27,7 @@ case $1 in build ) if [ "$CONFIG_ETCFS" = "AUFS" ]; then - make CONFIG_AUFS_FAKE_DM= CONFIG_AUFS_SYSAUFS= CONFIG_AUFS_STAT=y CONFIG_AUFS_MAGIC_SYSRQ= KDIR=$KERNELDIR SUBLEVEL=25 -f local.mk || exit 1 + make CONFIG_AUFS_FAKE_DM= CONFIG_AUFS_SYSAUFS= CONFIG_AUFS_STAT=y CONFIG_AUFS_MAGIC_SYSRQ= KDIR=$KERNELDIR SUBLEVEL=25 -f local.mk || exit 1 fi ;; Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- prepare 30 May 2008 13:46:20 -0000 1.77 +++ prepare 17 Jun 2008 22:59:46 -0000 1.78 @@ -141,7 +141,15 @@ fi fi fi - + + if [ "$CONFIG_ETCFS" = "AUFS" ]; then + if [ ! -f $KERNELDIR/.done_aufs_patch ]; then + AUFSDIR=$(find_src_dir aufs) + patch -d $KERNELDIR -p1 -i ${AUFSDIR}/patch/sec_perm-2.6.24.patch || exit 1 + touch $KERNELDIR/.done_aufs_patch + fi + fi + # make sure all netfilter modules are enabled set_all_kernel_options net/bridge set_all_kernel_options net/netfilter |