projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5b7145
)
Update bsd4grml to version 20110521
author
Christian Hofstaedtler
<ch@grml.org>
Sat, 21 May 2011 22:11:19 +0000
(
00:11
+0200)
committer
Christian Hofstaedtler
<ch@grml.org>
Sat, 21 May 2011 22:11:19 +0000
(
00:11
+0200)
templates/boot/addons/bsd4grml/LICENCE.TXT
patch
|
blob
|
history
templates/boot/addons/bsd4grml/boot.cfg
patch
|
blob
|
history
templates/boot/addons/bsd4grml/bsd.rd
patch
|
blob
|
history
templates/boot/addons/bsd4grml/gpl_srcs.tgz
patch
|
blob
|
history
templates/boot/addons/bsd4grml/ldbsd.com
patch
|
blob
|
history
templates/boot/addons/bsd4grml/loopback.0
patch
|
blob
|
history
diff --git
a/templates/boot/addons/bsd4grml/LICENCE.TXT
b/templates/boot/addons/bsd4grml/LICENCE.TXT
index
dbfedc4
..
1f51303
100644
(file)
--- a/
templates/boot/addons/bsd4grml/LICENCE.TXT
+++ b/
templates/boot/addons/bsd4grml/LICENCE.TXT
@@
-9,7
+9,8
@@
DESCRIPTION
covering the operating system.
MIROS PROJECT
covering the operating system.
MIROS PROJECT
- MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011
The MirOS Project <miros-dev@mirbsd.org>
and its contributors.
The MirOS Project <miros-dev@mirbsd.org>
and its contributors.
@@
-422,4
+423,4
@@
BUGS
MirOS project at <miros-discuss@mirbsd.org> if you think you have
discovered a bug.
MirOS project at <miros-discuss@mirbsd.org> if you think you have
discovered a bug.
-MirOS January
6, 2010
6
+MirOS January
3, 2011
6
diff --git
a/templates/boot/addons/bsd4grml/boot.cfg
b/templates/boot/addons/bsd4grml/boot.cfg
index
2116e7c
..
f805bfd
100644
(file)
--- 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.
5 2010/01/06 18:52:22
tg Exp $
+# $MirOS: src/distrib/common/grml/boot.cfg,v 1.
6 2011/01/03 17:49:38
tg Exp $
#
set image /boot/addons/bsd4grml/bsd.rd
set timeout 12
#
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 ==================================================================
macro slx machine exec dos
echo
echo ==================================================================
-echo # MirOS BSD #10-current [grml] | (c) 2002-201
0
The MirOS Project #
+echo # MirOS BSD #10-current [grml] | (c) 2002-201
1
The MirOS Project #
echo ==================================================================
echo
echo To boot the MirOS BSD based rescue system, wait twelve seconds or
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
1fb6dc0
..
160e497
100644
(file)
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
7e9590d
..
5c88971
100644
(file)
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
47dc42b
..
f156547
100644
(file)
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
0c75de1
..
cdc54cf
100644
(file)
--- 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.
2 2010/08/15 17:03:31
tg Exp $
+# $MirOS: src/distrib/common/grml/loopback.0,v 1.
3 2011/01/03 17:49:38
tg Exp $
#
set image /bsd
set timeout 12
#
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 ==================================================================
macro slx machine exec dos
echo
echo ==================================================================
-echo # MirOS BSD #10-current [grml] | (c) 2002-201
0
The MirOS Project #
+echo # MirOS BSD #10-current [grml] | (c) 2002-201
1
The MirOS Project #
echo ==================================================================
echo
echo To boot the MirOS BSD based rescue system, wait twelve seconds or
echo ==================================================================
echo
echo To boot the MirOS BSD based rescue system, wait twelve seconds or