diff options
| author | Dirk von Suchodoletz | 2008-02-29 22:50:06 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-02-29 22:50:06 +0100 |
| commit | 7d4d42c6f5d6834174fccf356e35d43b5bd89338 (patch) | |
| tree | 479f95e284279067561daa00cf763e0cb440bd5b /initramfs | |
| parent | Cleanups and fixes, see #191 ... (diff) | |
| download | core-7d4d42c6f5d6834174fccf356e35d43b5bd89338.tar.gz core-7d4d42c6f5d6834174fccf356e35d43b5bd89338.tar.xz core-7d4d42c6f5d6834174fccf356e35d43b5bd89338.zip | |
Trying on another export type -> dnbd2 ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1585 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/cdboot/mkcdboot | 4 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/initramfs/cdboot/mkcdboot b/initramfs/cdboot/mkcdboot index cefe7f09..4787f27a 100755 --- a/initramfs/cdboot/mkcdboot +++ b/initramfs/cdboot/mkcdboot @@ -7,8 +7,8 @@ # # General information about OpenSLX can be found at http://openslx.org # -# Script for generating an InitRamFS for using a demo CD/DVD instead of -# PXE/linux boot functionality +# Script for generating an InitRamFS for using a demo CD/DVD (via kexec +# mechanism) instead of PXE/linux boot functionality BUILDDIR=/tmp/slxcdboot SLX_SHARE_PATH=/opt/openslx/share diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index f47092cc..a6979800 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -441,7 +441,7 @@ if [ -n "${bldmod}" ] ; then fi done usleep 100 - echo noop > /sys/block/nbd0/queue/scheduler + echo deadline > /sys/block/nbd0/queue/scheduler # switch off unneeded block read ahead echo "0" > /sys/block/nbd0/queue/read_ahead_kb ;; @@ -450,7 +450,8 @@ if [ -n "${bldmod}" ] ; then RDEV=/dev/vnbd0 waitfor "${RDEV}" 20000 || error "$init_nbddev" # check for others in machine-setup and then kernel cmdline - rootfs="$(sed -n "/rootfs=/p" /etc/machine-setup|sed "s,rootfs=,,;s,\",,g") " + rootfs="$(sed -n "/rootfs=/p" /etc/initramfs-setup| \ + sed "s,rootfs=,,;s,\",,g") " [ -z "$rootfs" ] && \ rootfs="$(cat /proc/cmdline|sed "s,.*rootfs=\",,;s,\".*,,") " i=0 |