diff options
| author | Sebastian Schmelzer | 2011-05-25 21:17:16 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-05-25 21:17:16 +0200 |
| commit | 9ae95f18cc0a53b69ba1a927d90d3dded265689d (patch) | |
| tree | 508d467b4cb2e6de639e78166161724459fc61b6 /src/initramfs | |
| parent | test union detection .. (diff) | |
| parent | Typo fix in init ... (diff) | |
| download | core-9ae95f18cc0a53b69ba1a927d90d3dded265689d.tar.gz core-9ae95f18cc0a53b69ba1a927d90d3dded265689d.tar.xz core-9ae95f18cc0a53b69ba1a927d90d3dded265689d.zip | |
Merge branch 'master' of openslx.org:openslx/core
Conflicts:
src/initramfs/scripts/init
Diffstat (limited to 'src/initramfs')
| -rwxr-xr-x | src/initramfs/scripts/init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index a680a4c5..a2db7a88 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -757,7 +757,7 @@ fi if [ ${aufs} -eq 0 -a ${unionfs} -eq 0 -a -z "${cowloop}" ] ; then error "$init_deselau" nonfatal - unset aufs unionfs + unset fuse aufs unionfs else error "$init_loadaufs" nonfatal unset aufs unionfs |