diff options
| author | Dirk von Suchodoletz | 2007-10-01 22:15:25 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-10-01 22:15:25 +0200 |
| commit | bc943011dc2a3d98dda18e336d8975205453edc3 (patch) | |
| tree | a136e4621902146be39e2d3f3549abeb8ffc603a /initramfs | |
| parent | * updated 64-bit busybox to 1.7.1 (built on our 64-bit (diff) | |
| download | core-bc943011dc2a3d98dda18e336d8975205453edc3.tar.gz core-bc943011dc2a3d98dda18e336d8975205453edc3.tar.xz core-bc943011dc2a3d98dda18e336d8975205453edc3.zip | |
Fix for lbdev boot (hopefully :))
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1365 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 2 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 7555c6a9..0cc0fe36 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -77,7 +77,7 @@ while [ $len -le 30 ] ; do len=$(($len + 1)) done echo " - WELCOME TO $space \n (\l) + WELCOME TO $space \n (\l) _____ ______ ______ __ __ _______ __ __ __ / _ | _ | ___| | | | | ____| | | | | | | | | | |_| | |_ | | | | |___ | | / / diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index c971f8c1..8dd4380c 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -242,7 +242,7 @@ line in $0\n#nfsroot=\"${nfsserver}:${nfspath}\"\n" >> /etc/machine-setup ;; lbdev) # use a local device for mounting root block device with given - # filesystem, e.g. rootfs=device://sda2/squashfs + # filesystem, e.g. rootfs=lbdev://sda2/squashfs bldmod="sata_sil sd_mod" blddev=$(uri_token $rootfs server) bldfst=$(uri_token $rootfs path) @@ -297,7 +297,7 @@ EOF fi # check if at least one type of IP configuration is availabe -if [ -n "$nodhcp" -a -z "$ldap" -a -z "$ipinfo" ] ; then +if [ -n "$nodhcp" -a -z "$ldap" -a -z "$ipinfo" -a $srvproto = "lbdev" ]; then echo -e "# You did not specify any advanced configuration mode for your \ clients. You\n# might want to add the token 'dhcp' for DHCP configuration, \ 'file(=source)'\n# for config file get via TFTP or 'ldap(=source)' for LDAP \ |