diff options
| author | Dirk von Suchodoletz | 2007-08-01 14:50:33 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-08-01 14:50:33 +0200 |
| commit | 2529d5de958238d2914e8670f3ed9104c39d9db5 (patch) | |
| tree | f1890d6a6bb3fcb3e13307d9258eeff167b05dba /initramfs/initrd-stuff/etc | |
| parent | * dropped support for CSV databases, as they are simply not good enough (diff) | |
| download | core-2529d5de958238d2914e8670f3ed9104c39d9db5.tar.gz core-2529d5de958238d2914e8670f3ed9104c39d9db5.tar.xz core-2529d5de958238d2914e8670f3ed9104c39d9db5.zip | |
Allow local block device for client root filesystem (URI is
rootfs=lbdev://disk/fs, e.g. disk=sda2, fs=squashfs)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1296 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 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index c0a45725..34b1cd27 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -182,11 +182,11 @@ fi ############################################################################# # definition of wlan interface name and wireless connect wlanlinksetup () { -if=$(iwconfig 2>/dev/null|sed -n "/ESSID:/p"|sed "s/ .*//") +local wlanif=$(iwconfig 2>/dev/null|sed -n "/ESSID:/p"|sed "s/ .*//") if [ -n "$if" ] ; then - ip link set dev $if up - if iwconfig $if mode managed essid "${essid}"; then - nwif=$if + ip link set dev ${wlanif} up + if iwconfig ${wlanif} mode managed essid "${essid}"; then + nwif=${wlanif} else error "$init_nowlan" fi diff --git a/initramfs/initrd-stuff/etc/messages b/initramfs/initrd-stuff/etc/messages index 8753cfa1..f31040a3 100644 --- a/initramfs/initrd-stuff/etc/messages +++ b/initramfs/initrd-stuff/etc/messages @@ -79,7 +79,7 @@ init_loadcow=" Loading of Copy On Write (COW - special block device) module \ 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_cownobld=" Loading of cow module is of no sense if no network block \ +init_cownobld=" Loading of cow module is of no sense if no network/other block \ 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 \ |