[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-1-g89abea4

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 89abea479f6b685318fc79b97605e71d5fd8083d
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Mar 17 20:33:15 2010 +0100

    Updating appending of union boot paramater to only append, when we're not using aufs.

diff --git a/helpers/binary_grub b/helpers/binary_grub
index 25305ba..2fd2a5a 100755
--- a/helpers/binary_grub
+++ b/helpers/binary_grub
@@ -195,7 +195,7 @@ then
 	esac
 fi
 
-if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
index 440617b..0d17214 100755
--- a/helpers/binary_grub2
+++ b/helpers/binary_grub2
@@ -169,7 +169,7 @@ then
 	esac
 fi
 
-if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi
diff --git a/helpers/binary_silo b/helpers/binary_silo
index 766a18c..063944c 100755
--- a/helpers/binary_silo
+++ b/helpers/binary_silo
@@ -162,7 +162,7 @@ then
 	esac
 fi
 
-if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
index 404727f..e3a8f72 100755
--- a/helpers/binary_syslinux
+++ b/helpers/binary_syslinux
@@ -448,7 +448,7 @@ then
 	esac
 fi
 
-if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
index 777cab7..08269f3 100755
--- a/helpers/binary_yaboot
+++ b/helpers/binary_yaboot
@@ -201,7 +201,7 @@ then
 	esac
 fi
 
-if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
 then
 	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
 fi

-- 
live-helper