 +echo -n "File capabilities: "
 +if [ $(kernel_version $KVER) -le $(kernel_version 2 6 32) ]; then
 +        is_enabled CONFIG_SECURITY_FILE_CAPABILITIES
-+else
+ else
+-KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
+-    sed -r 's/.* [0-9]\.([0-9]{1,3})\.[0-9]{1,3}.*/\1/')
 +        SETCOLOR_SUCCESS && echo "enabled" && SETCOLOR_NORMAL
-+fi
+ fi
+-echo -n "File capabilities: " &&
+-    ( [[ ${KVER_MAJOR} == 2 && ${KVER_MINOR} < 33 ]] &&
+-       is_enabled CONFIG_SECURITY_FILE_CAPABILITIES ) ||
+-    ( [[ ( ${KVER_MAJOR} == 2 && ${KVER_MINOR} > 32 ) ||
+-         ${KVER_MAJOR} > 2 ]] && $SETCOLOR_SUCCESS &&
+-         echo -e "enabled" && $SETCOLOR_NORMAL )
+ 
  echo
  echo "Note : Before booting a new kernel, you can check its configuration"
  echo "usage : CONFIG=/path/to/config $0"
  echo
 -
 diff -Naurp lxc.orig/src/lxc/lxc-clone.in lxc/src/lxc/lxc-clone.in
---- lxc.orig/src/lxc/lxc-clone.in	2012-01-10 14:10:12.544528369 +0100
-+++ lxc/src/lxc/lxc-clone.in	2012-01-20 23:53:18.973343197 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- #
- # lxc: linux Container library
-@@ -162,7 +162,7 @@ oldroot=`grep lxc.rootfs $lxc_path/$lxc_
- if [ -b $oldroot ]; then
- 	# this is a device.  If we don't want to snapshot, then mkfs, mount
- 	# and rsync.  Trivial but not yet implemented
--	if [ $snapshot == "no" ]; then
-+	if [ $snapshot = "no" ]; then
- 		echo "non-snapshot and non-lvm clone of block device not yet implemented"
- 		exit 1
- 	fi
+--- lxc.orig/src/lxc/lxc-clone.in	2012-03-02 13:20:15.859239022 +0100
++++ lxc/src/lxc/lxc-clone.in	2012-03-09 12:43:15.615270353 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ #
+ # lxc: linux Container library
 diff -Naurp lxc.orig/src/lxc/lxc-create.in lxc/src/lxc/lxc-create.in
---- lxc.orig/src/lxc/lxc-create.in	2012-01-10 14:10:12.548528394 +0100
-+++ lxc/src/lxc/lxc-create.in	2012-01-20 23:53:18.973343197 +0100
+--- lxc.orig/src/lxc/lxc-create.in	2012-03-09 12:39:58.430294287 +0100
++++ lxc/src/lxc/lxc-create.in	2012-03-09 12:41:35.350756130 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh

-echo -n "Veth pair device: " && is_enabled CONFIG_VETH
-echo -n "Macvlan: " && is_enabled CONFIG_MACVLAN
-echo -n "Vlan: " && is_enabled CONFIG_VLAN_8021Q
-KVER_MINOR=$($GREP '^# Linux' $CONFIG | \
-    sed -r 's/.*2.6.([0-9]{2}).*/\1/')
-echo -n "File capabilities: " &&
-    [[ ${KVER_MINOR} < 33 ]] && is_enabled CONFIG_SECURITY_FILE_CAPABILITIES ||
-    [[ ${KVER_MINOR} > 32 ]] &&  $SETCOLOR_SUCCESS && echo -e "enabled" &&
-    $SETCOLOR_NORMAL
-
+is_enabled "Veth pair device: " CONFIG_VETH
+is_enabled "Macvlan: " CONFIG_MACVLAN
+is_enabled "Vlan: " CONFIG_VLAN_8021Q

-    $SETCOLOR_SUCCESS && echo -e "enabled" && $SETCOLOR_NORMAL
+    SETCOLOR_SUCCESS && echo "enabled" && SETCOLOR_NORMAL
 else
     echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS yes
 fi
-echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE
-echo -n "Cgroup sched: " && is_enabled CONFIG_CGROUP_SCHED
