diff options
| author | Dirk von Suchodoletz | 2011-05-25 19:30:00 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-05-25 19:30:00 +0200 |
| commit | 1d9506ec70249ea8e44476eac9086d495fa5d1b7 (patch) | |
| tree | 883bfda1508d60c2e133ada39f978d8e1f2cc74a /src/initramfs | |
| parent | Better expression ... (diff) | |
| parent | remove trailing whitespaces (diff) | |
| download | core-1d9506ec70249ea8e44476eac9086d495fa5d1b7.tar.gz core-1d9506ec70249ea8e44476eac9086d495fa5d1b7.tar.xz core-1d9506ec70249ea8e44476eac9086d495fa5d1b7.zip | |
Merge branch 'master' of git.openslx.org:openslx/core
Conflicts:
src/initramfs/scripts/init
Diffstat (limited to 'src/initramfs')
| -rwxr-xr-x | src/initramfs/scripts/init | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 63554336..6ecd0461 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -725,10 +725,14 @@ union_type="" if [ ${aufs} -eq 1 ] && grep -q aufs /proc/filesystems || \ { modprobe ${MODPRV} aufs 2>/dev/null && \ lsmod | grep -qe "^aufs" ; } ; then union_type="AUFS" -elif [ ${unionfs} -eq 1 ] && grep -q unionfs /proc/filesystems || \ +elif [ ${unionfs} -eq 1 ] && grep -q unionfs /proc/filesystems || \ { modprobe ${MODPRV} unionfs 2>/dev/null && \ lsmod | grep -qe "^unionfs" ; } ; then union_type="UnionFS" +<<<<<<< HEAD elif [ "x${fuse}" != "x" ] && grep -q fuse /proc/filesystems || \ +======= +elif [ -n "${fuse}" ] && grep -q fuse /proc/filesystems || \ +>>>>>>> edc3564438cfe9d144109b02bd5a05f82284ceec { modprobe ${MODPRV} fuse 2>/dev/null && \ lsmod | grep -qe "^fuse" ; } ; then union_type="FuSE" elif [ ${aufs} -eq 0 -a ${unionfs} -eq 0 -a -z "${cowloop}" ] ; then |