projects
/
grml-live-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c3a7a93
)
Update MirOS bsd4grml to 20160117
author
mirabilos
<t.glaser@tarent.de>
Sun, 17 Jan 2016 05:34:04 +0000
(06:34 +0100)
committer
mirabilos
<t.glaser@tarent.de>
Sun, 17 Jan 2016 05:34:04 +0000
(06:34 +0100)
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
[deleted file]
patch
|
blob
|
history
templates/boot/addons/bsd4grml/gpl_srcs.txz
[new file with mode: 0644]
patch
|
blob
templates/boot/addons/bsd4grml/ldbsd.com
patch
|
blob
|
history
templates/boot/addons/bsd4grml/ldbsd.txt
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
8cd2df1
..
30117e2
100644
(file)
--- 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,
MIROS PROJECT
MirOS is Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- 2011, 2012, 2013, 2014, 2015
+ 2011, 2012, 2013, 2014, 2015
, 2016
The MirOS Project <miros-dev@mirbsd.org>
and its contributors.
The MirOS Project <miros-dev@mirbsd.org>
and its contributors.
@@
-456,4
+456,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 2, 201
5
6
+MirOS January 2, 201
6
6
diff --git
a/templates/boot/addons/bsd4grml/boot.cfg
b/templates/boot/addons/bsd4grml/boot.cfg
index
ceafc93
..
b9f0b3a
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.1
0 2015/01/02 13:54:18
tg Exp $
+# $MirOS: src/distrib/common/grml/boot.cfg,v 1.1
1 2016/01/02 20:05:06
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
5
The MirOS Project #
+echo # MirOS BSD #10-current [grml] | (c) 2002-201
6
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
ac59a33
..
5e4625b
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
deleted file mode 100644
(file)
index
ee47897
..0000000
Binary files a/templates/boot/addons/bsd4grml/gpl_srcs.tgz and /dev/null differ
diff --git a/templates/boot/addons/bsd4grml/gpl_srcs.txz
b/templates/boot/addons/bsd4grml/gpl_srcs.txz
new file mode 100644
(file)
index 0000000..
21caebd
Binary files /dev/null and b/templates/boot/addons/bsd4grml/gpl_srcs.txz differ
diff --git
a/templates/boot/addons/bsd4grml/ldbsd.com
b/templates/boot/addons/bsd4grml/ldbsd.com
index
aa9efad
..
82c089e
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/ldbsd.txt
b/templates/boot/addons/bsd4grml/ldbsd.txt
index
79e4bcf
..
3946d92
100644
(file)
--- a/
templates/boot/addons/bsd4grml/ldbsd.txt
+++ b/
templates/boot/addons/bsd4grml/ldbsd.txt
@@
-484,4
+484,4
@@
CAVEATS
and assumes that the entire floppy disc (except, on sparc, the
MD disklabel) is a valid ustar archive.
and assumes that the entire floppy disc (except, on sparc, the
MD disklabel) is a valid ustar archive.
-MirOS BSD #10-current
August 6, 2010
7
+MirOS BSD #10-current
October 9, 2015
7
diff --git
a/templates/boot/addons/bsd4grml/loopback.0
b/templates/boot/addons/bsd4grml/loopback.0
index
379f6ef
..
adf5434
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.
7 2015/01/02 13:54:18
tg Exp $
+# $MirOS: src/distrib/common/grml/loopback.0,v 1.
8 2016/01/02 20:05:06
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
5
The MirOS Project #
+echo # MirOS BSD #10-current [grml] | (c) 2002-201
6
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