diff options
author | Dirk von Suchodoletz | 2011-05-26 15:38:18 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2011-05-26 15:38:18 +0200 |
commit | f78711647c51af755c9dab74fa5b263d5c51d213 (patch) | |
tree | d64c0754244d99b93603b0805bba9e836e160886 /src/initramfs/scripts/init | |
parent | In new SuSE 11.4 the /var/log/btmp is needed to exist. (diff) | |
parent | add support for domain search lists to busybox udhc (diff) | |
download | core-f78711647c51af755c9dab74fa5b263d5c51d213.tar.gz core-f78711647c51af755c9dab74fa5b263d5c51d213.tar.xz core-f78711647c51af755c9dab74fa5b263d5c51d213.zip |
Merge branch 'master' of git.openslx.org:openslx/core
Diffstat (limited to 'src/initramfs/scripts/init')
-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 80732f1a..d1bdebbc 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -733,7 +733,7 @@ if [ ${aufs} -eq 1 ]; then fi fi -if [ -z ${union_type} -a ${unionfs} -eq 1 ]; then +if [ -z ${union_type} ] && [ ${unionfs} -eq 1 ]; then unionfs_in_kernel=$(grep -c unionfs /proc/filesystems) if [ ${unionfs_in_kernel} -eq 0 ]; then modprobe ${MODPRV} unionfs 2>/dev/null |