diff options
| author | Dirk von Suchodoletz | 2011-05-25 19:32:35 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-05-25 19:32:35 +0200 |
| commit | b46479406830a67ebade84f15075084dd246f902 (patch) | |
| tree | 9deb72b591e566cd1bdb39d55ae4dd18a2122a59 /src/initramfs | |
| parent | Merge branch 'master' of git.openslx.org:openslx/core (diff) | |
| download | core-b46479406830a67ebade84f15075084dd246f902.tar.gz core-b46479406830a67ebade84f15075084dd246f902.tar.xz core-b46479406830a67ebade84f15075084dd246f902.zip | |
Fixing the crap-commit ...
Diffstat (limited to 'src/initramfs')
| -rwxr-xr-x | src/initramfs/scripts/init | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 6ecd0461..f778125d 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -728,13 +728,9 @@ if [ ${aufs} -eq 1 ] && grep -q aufs /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" + lsmod | grep -qe "^fuse" ; } ; then union_type="Fuse" elif [ ${aufs} -eq 0 -a ${unionfs} -eq 0 -a -z "${cowloop}" ] ; then error "$init_deselau" nonfatal unset aufs unionfs |