  	fi
      fi
  }
-@@ -39,7 +42,7 @@ if [ ! -f $CONFIG ]; then
-     [ -f "${HEADERS_CONFIG}" ] && CONFIG=${HEADERS_CONFIG}
-     [ -f "${BOOT_CONFIG}" ] && CONFIG=${BOOT_CONFIG}
-     GREP=grep
--    if [ ! -f $CONFIG ]; then
-+    if [ ! -f "$CONFIG" ]; then
-         echo
-         echo "The kernel configuration can not be retrieved."
-         echo "Please recompile with IKCONFIG_PROC, or"
-@@ -53,45 +56,45 @@ if [ ! -f $CONFIG ]; then
+ 
+-if [ ! -f $CONFIG ]; then
++if [ ! -f "$CONFIG" ]; then
+     echo "Kernel config $CONFIG not found, looking in other places..."
+     KVER="`uname -r`"
+     HEADERS_CONFIG="/lib/modules/$KVER/build/.config"
+@@ -53,13 +56,13 @@ if [ ! -f $CONFIG ]; then
  fi
  
  echo "--- Namespaces ---"

 #
 # lxc: linux Container library
diff -Naurp lxc.orig/src/lxc/lxc-destroy.in lxc/src/lxc/lxc-destroy.in
--- lxc.orig/src/lxc/lxc-destroy.in	2012-01-10 14:10:12.548528394 +0100
+++ lxc/src/lxc/lxc-destroy.in	2012-01-20 23:53:18.973343197 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # lxc: linux Container library
@@ -79,7 +79,7 @@ fi
 # If LVM partition, destroy it.  If anything else, ignore it.  We'll support
 # deletion of others later.
 rootdev=`grep lxc.rootfs $lxc_path/$lxc_name/config | awk -F= '{ print $2 '}`
-if [ -b $rootdev -o -h $rootdev ]; then
+if [ -b $rootdev ] || [ -h $rootdev ]; then
 	lvdisplay $rootdev > /dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		lvremove $rootdev
diff -Naurp lxc.orig/src/lxc/lxc-ls.in lxc/src/lxc/lxc-ls.in
--- lxc.orig/src/lxc/lxc-ls.in	2012-01-10 14:10:12.548528394 +0100
+++ lxc/src/lxc/lxc-ls.in	2012-01-20 23:53:18.973343197 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 lxcpath=@LXCPATH@
 
diff -Naurp lxc.orig/src/lxc/lxc-netstat.in lxc/src/lxc/lxc-netstat.in
--- lxc.orig/src/lxc/lxc-netstat.in	2012-01-10 14:10:12.548528394 +0100
+++ lxc/src/lxc/lxc-netstat.in	2012-01-20 23:53:18.973343197 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # set -ex
 
 usage() {
@@ -53,7 +53,7 @@ for i in "$cgroups"; do
     cgroup_name=$(echo $i | awk ' { print $1 } ')
     cgroup_path=$(echo $i | awk ' { print $3 } ')
 

-    $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
