summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-03-17 20:33:15 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:05 +0100
commitaf374e3c00be1313c0b3e3451ddb9d72c8442561 (patch)
treee921fd680efee77e72214bcdba9887354b89674a
parent58f50cbec1e4f4dae0896fc27ca07b69289711f8 (diff)
downloadvyos-live-build-af374e3c00be1313c0b3e3451ddb9d72c8442561.tar.gz
vyos-live-build-af374e3c00be1313c0b3e3451ddb9d72c8442561.zip
Updating appending of union boot paramater to only append, when we're not using aufs.
-rwxr-xr-xhelpers/binary_grub2
-rwxr-xr-xhelpers/binary_grub22
-rwxr-xr-xhelpers/binary_silo2
-rwxr-xr-xhelpers/binary_syslinux2
-rwxr-xr-xhelpers/binary_yaboot2
5 files changed, 5 insertions, 5 deletions
diff --git a/helpers/binary_grub b/helpers/binary_grub
index 25305ba8d..2fd2a5a57 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 440617bd2..0d17214c9 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 766a18ce8..063944cf6 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 404727f6d..e3a8f728c 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 777cab7d4..08269f382 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