diff options
| author | Dirk von Suchodoletz | 2011-06-04 12:44:28 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-06-04 12:44:28 +0200 |
| commit | 9be038292dc709336cdc02afbf37f5327d525af8 (patch) | |
| tree | 6d2812c5ad1d94628bbfbf1f2b0c1e9544391854 /src/initramfs | |
| parent | Fixing rsync issue and numberic id's (otherwise rsync maps by names which cau... (diff) | |
| download | core-9be038292dc709336cdc02afbf37f5327d525af8.tar.gz core-9be038292dc709336cdc02afbf37f5327d525af8.tar.xz core-9be038292dc709336cdc02afbf37f5327d525af8.zip | |
Changes for common subdirectory for virtual machines, nofuse fix in init.
Diffstat (limited to 'src/initramfs')
| -rwxr-xr-x | src/initramfs/scripts/bin/hwautocfg | 2 | ||||
| -rwxr-xr-x | src/initramfs/scripts/init | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg index bd920d50..384d8a44 100755 --- a/src/initramfs/scripts/bin/hwautocfg +++ b/src/initramfs/scripts/bin/hwautocfg @@ -277,7 +277,7 @@ case $1 in # if required and mounting) disk) # try to enable compressed RAM SWAP - if modprobe ${MODPRV} ramzswap && [ -f /usr/bin/rzscontrol ] ; then + if modprobe ${MODPRV} ramzswap 2>/dev/null && [ -f /usr/bin/rzscontrol ] ; then mdev -s rzscontrol /dev/ramzswap0 --init swapon /dev/ramzswap0 diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 3571e789..716bab2b 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -747,7 +747,7 @@ if [ -z ${union_type} ] && [ ${unionfs} -eq 1 ]; then fi fi -if [ -z ${union_type} ] && [ ! -z ${fuse} ]; then +if [ -z ${union_type} ] && [ ${fuse} -eq 1 ]; then fuse_in_kernel=$(grep -c fuse /proc/filesystems) if [ ${fuse_in_kernel} -eq 0 ]; then modprobe ${MODPRV} fuse 2>/dev/null |