From: Thorsten Glaser Date: Wed, 18 Sep 2013 17:29:21 +0000 (+0000) Subject: Update MirOS bsd4grml to 20130915 X-Git-Tag: v0.18.4~1 X-Git-Url: http://git.grml.org/?p=grml-live-grml.git;a=commitdiff_plain;h=eb740392eddbe4856b7b3a919664ac0800cbf518 Update MirOS bsd4grml to 20130915 --- diff --git a/templates/boot/addons/bsd4grml/LICENCE.TXT b/templates/boot/addons/bsd4grml/LICENCE.TXT index b54fa7d..40345cd 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, 2012 + 2011, 2012, 2013 The MirOS Project and its contributors. @@ -51,9 +51,11 @@ MirOS' origins and the (OpenBSD-derived) kernel and userland, as well as the MirOS Port- able Subprojects (for example, mksh, MirMake and jupp), but excluding single ports, the contributed sections (the modules gcc, x11 and contrib) - and any part of MirBSD with copyright assignments in place (appropriate - CVS access control ought to be set). Please note that this copyright - still applies to some work contained within the X11 and contrib modules. + and any part of MirBSD that is either marked as "Public Domain" and not + derived from another project's work under a good copyright licence, or + with copyright assignments in place, unless stated otherwise. 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- @@ -454,4 +456,4 @@ BUGS MirOS project at if you think you have discovered a bug. -MirOS January 14, 2012 6 +MirOS January 1, 2013 6 diff --git a/templates/boot/addons/bsd4grml/boot.cfg b/templates/boot/addons/bsd4grml/boot.cfg index 52604d6..a380970 100644 --- a/templates/boot/addons/bsd4grml/boot.cfg +++ b/templates/boot/addons/bsd4grml/boot.cfg @@ -1,4 +1,4 @@ -# $MirOS: src/distrib/common/grml/boot.cfg,v 1.7 2012/01/14 18:59:31 tg Exp $ +# $MirOS: src/distrib/common/grml/boot.cfg,v 1.8 2013/01/01 17:31:07 tg Exp $ # set image /boot/addons/bsd4grml/bsd.rd set timeout 12 @@ -8,7 +8,7 @@ macro grml grub%GRUB_VERSION% macro slx machine exec dos echo echo ================================================================== -echo # MirOS BSD #10-current [grml] | (c) 2002-2012 The MirOS Project # +echo # MirOS BSD #10-current [grml] | (c) 2002-2013 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 1178348..a70edc9 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 6397d03..47a49b4 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 3258862..98c0f04 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 e949aed..badc39d 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.4 2012/01/14 18:59:31 tg Exp $ +# $MirOS: src/distrib/common/grml/loopback.0,v 1.5 2013/01/01 17:31:07 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-2012 The MirOS Project # +echo # MirOS BSD #10-current [grml] | (c) 2002-2013 The MirOS Project # echo ================================================================== echo echo To boot the MirOS BSD based rescue system, wait twelve seconds or