From 9be038292dc709336cdc02afbf37f5327d525af8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 4 Jun 2011 12:44:28 +0200
Subject: Changes for common subdirectory for virtual machines, nofuse fix in
 init.

---
 src/initramfs/scripts/bin/hwautocfg | 2 +-
 src/initramfs/scripts/init          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/initramfs')

diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg
index bd920d50..384d8a44 100755
--- a/src/initramfs/scripts/bin/hwautocfg
+++ b/src/initramfs/scripts/bin/hwautocfg
@@ -277,7 +277,7 @@ case $1 in
   # if required and mounting)
   disk)
     # try to enable compressed RAM SWAP
-    if modprobe ${MODPRV} ramzswap && [ -f /usr/bin/rzscontrol ] ; then
+    if modprobe ${MODPRV} ramzswap 2>/dev/null && [ -f /usr/bin/rzscontrol ] ; then
       mdev -s
       rzscontrol /dev/ramzswap0 --init
       swapon /dev/ramzswap0
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index 3571e789..716bab2b 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -747,7 +747,7 @@ if [ -z ${union_type} ] && [ ${unionfs} -eq 1 ]; then
   fi
 fi
 
-if [ -z ${union_type} ] && [ ! -z ${fuse} ]; then
+if [ -z ${union_type} ] && [ ${fuse} -eq 1 ]; then
   fuse_in_kernel=$(grep -c fuse /proc/filesystems)
   if [ ${fuse_in_kernel} -eq 0 ]; then
     modprobe ${MODPRV} fuse 2>/dev/null
-- 
cgit v1.2.3-55-g7522