From 4ca13a6fe8fee9fc6dbbea3f99e83682fe4fe458 Mon Sep 17 00:00:00 2001
From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 22 May 2009 16:39:19 +0000
Subject: [PATCH] Enable IPv4 forwarding by default in a slice

---
 scripts/vuseradd     | 6 +++++-
 util-vserver-pl.spec | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 627b5d4..ef57534 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -87,7 +87,7 @@ if [ ! -d $__CONFDIR/$NAME ] ; then
 	echo "Error $RETVAL building $DIR"
 	rm -rf $DIR $__DEFAULT_VSERVERDIR/$NAME
     fi
-    mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/dlimits/0
+    mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/dlimits/0 $DIR/sysctl/0
     echo default > $DIR/apps/init/mark
     echo 1000 > $DIR/rlimits/nproc.hard
 
@@ -110,6 +110,10 @@ if [ ! -d $__CONFDIR/$NAME ] ; then
     echo -1 > $DIR/dlimits/0/inodes_total
     echo -1 > $DIR/dlimits/0/space_total
 
+    # Set up sysctl variables
+    echo net.ipv4.ip_forward > $DIR/sysctl/0/setting
+    echo 1 > $DIR/sysctl/0/value
+    
     # Disable mount namespaces
     touch $DIR/nonamespace
 
diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index a6fe3f3..67d41e2 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -5,7 +5,7 @@
 
 %define name	util-vserver-pl
 %define version 0.4
-%define taglevel 1.trellis
+%define taglevel 2.trellis
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
-- 
2.47.0