diff options
| author | Dirk von Suchodoletz | 2008-02-28 02:48:27 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-02-28 02:48:27 +0100 |
| commit | 7da1ffcbc228ac3a1c2fb15a35ed36104f6810a1 (patch) | |
| tree | 2397f17e72a07f7e0e53eac816425d26d4686d8b /initramfs | |
| parent | Improved CD preboot init file ... (diff) | |
| download | core-7da1ffcbc228ac3a1c2fb15a35ed36104f6810a1.tar.gz core-7da1ffcbc228ac3a1c2fb15a35ed36104f6810a1.tar.xz core-7da1ffcbc228ac3a1c2fb15a35ed36104f6810a1.zip | |
Cleanups and fixes, see #191 ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1584 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/cdboot/init | 13 | ||||
| -rwxr-xr-x | initramfs/cdboot/mkcdboot | 9 |
2 files changed, 18 insertions, 4 deletions
diff --git a/initramfs/cdboot/init b/initramfs/cdboot/init index 338a171e..5562c167 100755 --- a/initramfs/cdboot/init +++ b/initramfs/cdboot/init @@ -142,7 +142,7 @@ chmod u+x /usr/share/udhcpc/default.script modprobe -q af_packet [ -n $vci ] && vci="-V $vci" udhcpc -n -q $vci -s /usr/share/udhcpc/default.script -i $nwif 2>/dev/null -if test -e /tmp/ipstuff ; then +if grep "ip=" /tmp/ipstuff >/dev/null 2>&1 ; then . /tmp/ipstuff for i in $dns ; do echo "nameserver $i" >> /etc/resolv.conf @@ -164,11 +164,16 @@ wget -q -c -O /tmp/iramfs \ ftp://openslx:OpenS1X@archive.ruf.uni-freiburg.de/iramfs 2>/dev/null ) || \ /bin/ash -# start a debug shell -[ "${DEBUGLEVEL}" -gt 0 ] && /bin/ash +# start a debug shell if needed, else set quiet kernel parameter +if [ "${DEBUGLEVEL}" -gt 0 ] ; then + /bin/ash +else + quiet=quiet + echo -e "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" +fi # start the new kernel with initialramfs and cmdline echo "Booting OpenSLX client ..." kexec -l /tmp/kernel --initrd=/tmp/iramfs --append="ip=$ip:$siaddr:$router:$subnet\ - file=ftp://132.230.4.4/default.tgz debug=${DEBUGLEVEL}" + file=ftp://132.230.4.4/default.tgz debug=${DEBUGLEVEL} $quiet" kexec -e diff --git a/initramfs/cdboot/mkcdboot b/initramfs/cdboot/mkcdboot index 5fc588fd..cefe7f09 100755 --- a/initramfs/cdboot/mkcdboot +++ b/initramfs/cdboot/mkcdboot @@ -73,6 +73,15 @@ http://www.openslx.org\n\tENDTEXT" \ echo -e "\tKERNEL vmlinuz\n\tAPPEND initrd=cdirfs quiet" \ >> ${BUILDDIR}/iso/isolinux/isolinux.cfg +# write some info, if CD/DVD is still in drive +echo -e "You seem to have the OpenSLX network demo CD/DVD still in your \ +optical\ndrive! This is not required. You may safely remove the medium \ +just\nafter the first kernel/initramfs is loaded ...\n\nIf you have any \ +feedback please consult http://openslx.org/feedback\nand send your comments \ +to feedback@openslx.org!" > ${BUILDDIR}/iso/README +echo -e "This package is free software distributed under the GPL version 2.\ +\nSee http://openslx.org/COPYING" > ${BUILDDIR}/iso/LICENSE + # produce the iso image mkisofs -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -r -J -l \ -boot-info-table -o OpenSLX.iso -joliet-long -publisher "OpenSLX \ |