diff options
| author | Felix Endres | 2007-04-21 16:34:00 +0200 |
|---|---|---|
| committer | Felix Endres | 2007-04-21 16:34:00 +0200 |
| commit | 2f0b206504e1421c78cd2630f62005b20a44afe0 (patch) | |
| tree | 80b960a77d3aa5a3a88a85a7e0e1c526ac07c635 /initramfs/initrd-stuff/etc | |
| parent | AUFS and UnionFS adjustments (diff) | |
| download | core-2f0b206504e1421c78cd2630f62005b20a44afe0.tar.gz core-2f0b206504e1421c78cd2630f62005b20a44afe0.tar.xz core-2f0b206504e1421c78cd2630f62005b20a44afe0.zip | |
Bugfixing and fine-tuning last changes
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@914 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/etc')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 8 | ||||
| -rw-r--r-- | initramfs/initrd-stuff/etc/messages | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 9a049c15..1fa21a35 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -981,12 +981,12 @@ include_in_fsroot_union () { #iscsitarget=$(uri_token $ROOTFS path) ;; esac - if [ "X$union_type" == "Xunionfs" ]; then - echo "Using unionctl to mount ${root_path}_${union_id} (type: $union_type)" + if [ "X$union_type" == "XUnionFS" ]; then + [ "$DEBUGLEVEL" -gt 2 -a "$DEBUGLEVEL" != 8 ] && echo "Using unionctl to mount ${root_path}_${union_id} (type: $union_type)" unionctl /mnt/ --add --after 1 --mode ro /mnt/tmp/${root_path}_${union_id} - elif [ "X$union_type" == "Xaufs" ]; then + elif [ "X$union_type" == "XAUFS" ]; then #unionctl for aufs is a sh script needing tools not included in our initrd - echo "Using aufs-mount to mount ${root_path}_${union_id} (type: $union_type)" + [ "$DEBUGLEVEL" -gt 2 -a "$DEBUGLEVEL" != 8 ] && echo "Using aufs-mount to mount ${root_path}_${union_id} (type: $union_type)" mount -n -o remount,add:1:/mnt/tmp/${root_path}_${union_id}=ro none /mnt else error $init_loadunions nonfatal diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages index 768c4b59..39f6c2bb 100644 --- a/initramfs/initrd-stuff/etc/messages +++ b/initramfs/initrd-stuff/etc/messages @@ -70,8 +70,8 @@ failed -\n Either module is not present or module does not match the \ running\n kernel. If you do not want to see this message remove the token \ 'cowloop' from kernel command line." init_cownonbd=" Loading of cow module is of no sense if no network block \ -device is used or\n UnionFS was specified as read write layer too. Remove \ -UnionFS token from\n kernel commandline if cowloop should be used instead." +device is used or\n UnionFS/AUFS was specified as read write layer too. Remove \ +UnionFS/AUFS token from\n kernel commandline if cowloop should be used instead." init_nfs=" Mount of root filesystem via NFS was requested via kernel command \ line\nbut failed. There might be the following reasons for that:\n\ * No nfs.ko module could be loaded and no NFS support was present in the\n\ |