summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-19 15:27:28 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:07 +0100
commit7963a3991305151ae2a713e4695aeb9e2854c962 (patch)
tree4c6e47de5dd25d1e677d5f7f41e1b5e3d9bbc7a5
parent2f2e77d4364b3248a2633505d4f7a25cc659e71e (diff)
downloadlive-boot-7963a3991305151ae2a713e4695aeb9e2854c962.tar.gz
live-boot-7963a3991305151ae2a713e4695aeb9e2854c962.zip
Removing unionfs workaround for kernel versions << 2.6.22, not usefull anymore.
-rwxr-xr-xscripts/live7
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/live b/scripts/live
index 26cd5cf..9479f3f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1101,13 +1101,8 @@ setup_unionfs ()
# Let's just mount the read-only file systems first
rofsstring=""
rofslist=""
- minor_kernel_version=$(uname -r|cut -c 5-|sed 's/[^0-9].*//')
- if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ]
- then
- # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
- roopt="nfsro"
- elif [ "${UNIONTYPE}" = "aufs" ]
+ if [ "${UNIONTYPE}" = "aufs" ]
then
roopt="rr"
else