From: Thorsten Glaser Date: Sun, 15 Jan 2012 19:54:51 +0000 (+0000) Subject: Update MirOS bsd4grml to 20120115 X-Git-Tag: v0.18.0~1 X-Git-Url: http://git.grml.org/?p=grml-live-grml.git;a=commitdiff_plain;h=0474e40181e0e3066899a6865df56594483bd9dd;hp=5b8ea64c3ded5fe8a65f276411a308b029ae9d3a Update MirOS bsd4grml to 20120115 - bootloader fix for >1 HDD - mksh fix - a leap second will happen this summer - etc… --- diff --git a/debian/copyright b/debian/copyright index 4058e8d..0284e35 100644 --- a/debian/copyright +++ b/debian/copyright @@ -28,10 +28,9 @@ License: License information for the bsd4grml files shipped as /usr/share/grml-live/templates/boot/addons/bsd4grml: - Downloaded from . - Thorsten "mirabilos" Glaser See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT - for details. + for details; full source code for GPL components is in gpl_srcs.tgz + and the rest can be retrieved from the MirOS CVS repository. The grml-live-compat provides copies of various files from other packages to make them available to Debian stable users. Please see the copyright files of diff --git a/templates/boot/addons/bsd4grml/LICENCE.TXT b/templates/boot/addons/bsd4grml/LICENCE.TXT index f751a94..b54fa7d 100644 --- a/templates/boot/addons/bsd4grml/LICENCE.TXT +++ b/templates/boot/addons/bsd4grml/LICENCE.TXT @@ -10,7 +10,7 @@ DESCRIPTION MIROS PROJECT MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011 + 2011, 2012 The MirOS Project and its contributors. @@ -55,6 +55,37 @@ MirOS' origins CVS access control ought to be set). Please note that this copyright still applies to some work contained within the X11 and contrib modules. +MIDNIGHTBSD + Some code has been derived from the compilation of software known as Mid- + nightBSD (which is derived from the compilation of software known as + FreeBSD); in particular, code which would otherwise be only accessible to + USA citizens as Public Domain was relicenced that way. For these, the + following terms apply: + + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 The MidnightBSD + Project. All rights reserved. + Copyright (C) 1992-2006 The FreeBSD Project. All rights reserved. + + Redistribution and use in source and binary forms, with or without modif- + ication, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright no- + tice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS "AS IS" AND ANY EX- + PRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAM- + AGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEV- + ER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LI- + ABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + NON-BSD SOFTWARE MirOS aggregates third-party work, which is owned by their respective au- thors and covered by their respective licences (Sendmail, Apache, LGPL, @@ -69,8 +100,8 @@ UCB ing Software Release is copyrighted by The Regents of the University of California. - Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 2003 The Regents of - the University of California. + Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994, + 2003 The Regents of the University of California. All rights reserved. Redistribution and use in source and binary forms, with or without modif- @@ -423,4 +454,4 @@ BUGS MirOS project at if you think you have discovered a bug. -MirOS January 3, 2011 6 +MirOS January 14, 2012 6 diff --git a/templates/boot/addons/bsd4grml/boot.6 b/templates/boot/addons/bsd4grml/boot.6 index 122520d..df846db 100644 --- a/templates/boot/addons/bsd4grml/boot.6 +++ b/templates/boot/addons/bsd4grml/boot.6 @@ -1,8 +1,9 @@ # $MirOS: src/distrib/common/grml/boot.6,v 1.4 2009/10/29 00:17:37 tg Exp $ # echo -echo Switching to GNU GRUB for booting +echo Switching to GNU GRUB %GRUB_VERSION% for booting echo into %RELEASE_INFO% echo +macro grub1 machine exec grub /boot/grub/stage2 macro grub2 machine exec grub /boot/grub/core.img -grub2 +grub%GRUB_VERSION% diff --git a/templates/boot/addons/bsd4grml/boot.cfg b/templates/boot/addons/bsd4grml/boot.cfg index cb17a24..52604d6 100644 --- a/templates/boot/addons/bsd4grml/boot.cfg +++ b/templates/boot/addons/bsd4grml/boot.cfg @@ -1,12 +1,14 @@ -# $MirOS: src/distrib/common/grml/boot.cfg,v 1.6 2011/01/03 17:49:38 tg Exp $ +# $MirOS: src/distrib/common/grml/boot.cfg,v 1.7 2012/01/14 18:59:31 tg Exp $ # set image /boot/addons/bsd4grml/bsd.rd set timeout 12 -macro grml machine exec grub /boot/grub/core.img +macro grub1 machine exec grub /boot/grub/stage2 +macro grub2 machine exec grub /boot/grub/core.img +macro grml grub%GRUB_VERSION% macro slx machine exec dos echo echo ================================================================== -echo # MirOS BSD #10-current [grml] | (c) 2002-2011 The MirOS Project # +echo # MirOS BSD #10-current [grml] | (c) 2002-2012 The MirOS Project # echo ================================================================== echo echo To boot the MirOS BSD based rescue system, wait twelve seconds or diff --git a/templates/boot/addons/bsd4grml/bsd.rd b/templates/boot/addons/bsd4grml/bsd.rd index 6bc2838..6553267 100644 Binary files a/templates/boot/addons/bsd4grml/bsd.rd and b/templates/boot/addons/bsd4grml/bsd.rd differ diff --git a/templates/boot/addons/bsd4grml/gpl_srcs.tgz b/templates/boot/addons/bsd4grml/gpl_srcs.tgz index 3c4cc73..6397d03 100644 Binary files a/templates/boot/addons/bsd4grml/gpl_srcs.tgz and b/templates/boot/addons/bsd4grml/gpl_srcs.tgz differ diff --git a/templates/boot/addons/bsd4grml/ldbsd.com b/templates/boot/addons/bsd4grml/ldbsd.com index 594f90d..be70143 100644 Binary files a/templates/boot/addons/bsd4grml/ldbsd.com and b/templates/boot/addons/bsd4grml/ldbsd.com differ diff --git a/templates/boot/addons/bsd4grml/loopback.0 b/templates/boot/addons/bsd4grml/loopback.0 index cdc54cf..e949aed 100644 --- a/templates/boot/addons/bsd4grml/loopback.0 +++ b/templates/boot/addons/bsd4grml/loopback.0 @@ -1,4 +1,4 @@ -# $MirOS: src/distrib/common/grml/loopback.0,v 1.3 2011/01/03 17:49:38 tg Exp $ +# $MirOS: src/distrib/common/grml/loopback.0,v 1.4 2012/01/14 18:59:31 tg Exp $ # set image /bsd set timeout 12 @@ -8,7 +8,7 @@ macro grml echo GRUB is deactivated in loopback.cfg! macro slx machine exec dos echo echo ================================================================== -echo # MirOS BSD #10-current [grml] | (c) 2002-2011 The MirOS Project # +echo # MirOS BSD #10-current [grml] | (c) 2002-2012 The MirOS Project # echo ================================================================== echo echo To boot the MirOS BSD based rescue system, wait twelve seconds or