From: Michael Prokop Date: Sat, 29 Sep 2007 09:42:47 +0000 (+0200) Subject: Support GRML_NAME, drop character limits, unify files in directory templates X-Git-Tag: 0.0.3~12 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4f8937bce96f552121e525eb927a2daea4dfae88 Support GRML_NAME, drop character limits, unify files in directory templates --- diff --git a/debian/changelog b/debian/changelog index 2980869..7cc5e7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ grml-live (0.0.3) unstable; urgency=low - * Make sure $SECONDS is set. - - -- Michael Prokop Fri, 28 Sep 2007 23:04:24 +0200 + * Support for setting GRML_NAME (like grml vs. grml-small + vs grml64 vs...) + * Drop the character limits of $VERSION and $RELEASENAME. + * Make sure $SECONDS is set before outputting the runtime. + * Unify usage of i386_files, place all template files in + directory templates now. + + -- Michael Prokop Sat, 29 Sep 2007 11:40:22 +0200 grml-live (0.0.2) unstable; urgency=low diff --git a/debian/overrides b/debian/overrides index 480d85f..8d3d1be 100644 --- a/debian/overrides +++ b/debian/overrides @@ -1,4 +1,5 @@ -grml-live: executable-not-elf-or-script ./usr/share/grml-live/windows/autostart/autorun.pif -grml-live: executable-not-elf-or-script ./usr/share/grml-live/windows/autostart/autorun.bat -grml-live: executable-not-elf-or-script ./usr/share/grml-live/windows/autostart/autorun.inf +grml-live: extra-license-file usr/share/grml-live/templates/GRML/LICENSE.txt +grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.pif +grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.inf +grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.bat grml-live: unknown-section grml diff --git a/debian/rules b/debian/rules index 42951e7..1e411db 100755 --- a/debian/rules +++ b/debian/rules @@ -36,8 +36,7 @@ install: build # Add here commands to install the package into debian/grml-live. cp -a etc debian/grml-live/ cp -a examples debian/grml-live/usr/share/doc/grml-live/ - cp -a i386_files debian/grml-live/usr/share/grml-live/ - cp -a windows debian/grml-live/usr/share/grml-live/ + cp -a templates debian/grml-live/usr/share/grml-live/ install -o root -m 755 grml-live debian/grml-live/usr/sbin/grml-live # Build architecture-independent files here. diff --git a/docs/grml-live.txt b/docs/grml-live.txt index b797d06..00ce4c2 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -10,8 +10,8 @@ Linux Live system (CD/ISO) Synopsis -------- -grml-live [-c ] [-i ] [-r ] -[-s ] [-t ] [-v ] [-Fvh] +grml-live [-c ] [-g ] [-i ] [-r ] +[-s ] [-t ] [-v ] [-FVh] ******************************************************************************* Important! This document is growing as requested. If you have questions which @@ -62,6 +62,10 @@ the classes GRMLBASE and I386 are assumed, resulting in a small base system Force execution and do not prompt for acknowledgment of configuration. + -g **GRML_NAME**:: + +Set the grml flavour name. Common usage examples: grml, grml-small, grml64. + -h:: Display short usage information and exit. @@ -73,8 +77,7 @@ by default. -r **RELEASENAME**:: -Specify name of the release. (Notice: the output of the release name is limited -to 30 characters.) +Specify name of the release. -s **SUITE**:: @@ -91,9 +94,7 @@ chroot system) and grml_isos (where the resulting ISO is stored). -v **VERSION_NUMBER**:: -Specify version number of the release. (Notice: the output of the version number -is limited to 5 characters. So "1.0-1" is fine, but "1.0.0.1" will be stripped -to "1.0.0" then.) +Specify version number of the release. -V:: diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 8c1fe24..523dce4 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Tue Sep 18 22:27:31 CEST 2007 [mika] +# Latest change: Sat Sep 29 10:46:18 CEST 2007 [mika] ################################################################################ # Main output directory @@ -28,6 +28,11 @@ ISO_TARGET="$TARGET/grml_isos" # know what you are doing; class I386 provides the kernel for x86 CLASSES="GRMLBASE,I386" +# Which grml name do you want to use? +# Common usage examples: grml, grml-small, grml64,... +# Default: 'grml' +# GRML_NAME="grml" + ## Which mirrors do you want to use? Please set GRML_LIVE_SOURCES *and* ## *FAI_DEBOOTSTRAP* accordingly. To use a local directory (like an NFS mount) ## check out MIRROR_DIRECTORY and MIRROR_SOURCES as well. @@ -57,10 +62,10 @@ CLASSES="GRMLBASE,I386" # ... and the sources.list entry for the directory: # MIRROR_SOURCES="deb file:///mnt/mirror/debian sid main contrib non-free" -# Version number of ISO (limited to 5 chars!): +# Version number of ISO: VERSION="0.0-1" -# Name of the release (limited to 30 chars!): +# Name of the release: RELEASENAME="grml-live just rocks!" # Specify hostname of the live-system: diff --git a/grml-live b/grml-live index a68dfa8..e31244d 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Fri Sep 21 17:00:20 CEST 2007 [mika] +# Latest change: Sat Sep 29 10:44:26 CEST 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -61,6 +61,7 @@ trap bailout 1 2 3 15 [ -n "$VERSION" ] || VERSION="0.0.1" [ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks" +[ -n "$GRML_NAME" ] || GRML_NAME='grml' [ -n "$LOGDIR" ] || LOGDIR="/var/log/fai/dirinstall/$HOSTNAME" [ -d "$LOGDIR" ] || mkdir -p $LOGDIR @@ -122,17 +123,18 @@ usage() echo " $PN - build process script for generating a (grml based) Linux Live-ISO -Usage: $PN [-c ] [-i ] [-r ] \\ - [-s ] [-t ] [-v ] [-Fvh] +Usage: $PN [-c ] [-g ] [-i ] \\ + [-r ] [-s ] [-t ] \\ + [-v ] [-FVh] Usage examples: $PN $PN -c GRMLBASE,GRML_X,I386 -t /grml/ $PN -c GRMLBASE,I386 -t /dev/shm/grml - $PN -c GRMLBASE,GRML_SMALL,I386 - $PN -c GRMLBASE,I386 -v -i grml_0.0-1.iso - $PN -c GRMLBASE,I386 -s sid + $PN -c GRMLBASE,GRML_SMALL,I386 -g grml-small -v 1.0 + $PN -c GRMLBASE,I386 -i grml_0.0-1.iso + $PN -c GRMLBASE,I386 -s sid -V More details: man grml-live /usr/share/doc/grml-live/grml-live.html @@ -145,9 +147,10 @@ http://grml.org/bugs/ # command line parsing {{{ -while getopts "c:i:r:s:t:v:FhV" opt; do +while getopts "c:g:i:r:s:t:v:FhV" opt; do case "$opt" in c) CLASSES="$OPTARG" ;; + g) GRML_NAME="$OPTARG" ;; i) ISO_NAME="$OPTARG" ;; r) RELEASENAME="$OPTARG" ;; s) SUITE="$OPTARG" ;; @@ -288,38 +291,40 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then else # booting stuff: mkdir -p "$BUILD_TARGET"/boot/isolinux + cp /boot/memtest86+.bin "$BUILD_TARGET"/boot/isolinux/memtest + cp "$CHROOT_TARGET"/boot/initrd* "$BUILD_TARGET"/boot/isolinux/initrd.gz + cp "$CHROOT_TARGET"/boot/vmlinuz* "$BUILD_TARGET"/boot/isolinux/linux26 + cp /usr/lib/syslinux/chain.c32 "$BUILD_TARGET"/boot/isolinux/ + cp /usr/lib/syslinux/isolinux.bin "$BUILD_TARGET"/boot/isolinux/ + cp /usr/lib/syslinux/memdisk "$BUILD_TARGET"/boot/isolinux/ + cp /usr/lib/syslinux/menu.c32 "$BUILD_TARGET"/boot/isolinux/ + cp /usr/share/grml-live/templates/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ + cp /usr/share/grml-live/templates/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ + cp -a /usr/share/grml-live/templates/boot/grub "$BUILD_TARGET"/boot/ + [ -d "$BUILD_TARGET"/GRML ] || mkdir "$BUILD_TARGET"/GRML - cp /boot/memtest86+.bin "$BUILD_TARGET"/boot/isolinux/memtest - cp "$CHROOT_TARGET"/boot/initrd* "$BUILD_TARGET"/boot/isolinux/initrd.gz - cp "$CHROOT_TARGET"/boot/vmlinuz* "$BUILD_TARGET"/boot/isolinux/linux26 - cp /usr/lib/syslinux/chain.c32 "$BUILD_TARGET"/boot/isolinux/ - cp /usr/lib/syslinux/isolinux.bin "$BUILD_TARGET"/boot/isolinux/ - cp /usr/lib/syslinux/memdisk "$BUILD_TARGET"/boot/isolinux/ - cp /usr/lib/syslinux/menu.c32 "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ - cp /usr/share/grml-live/i386_files/boot/isolinux/* "$BUILD_TARGET"/boot/isolinux/ - cp -a /usr/share/grml-live/i386_files/boot/grub "$BUILD_TARGET"/boot/ + cp -a /usr/share/grml-live/templates/GRML/* "$BUILD_TARGET"/GRML/ # adjust boot splash information: ISO_DATE="$(date +%Y-%m-%d)" - VERSION="$(cut_string 5 "$VERSION")" ; VERSION="$(extend_string_end 5 "$VERSION")" - RELEASENAME="$(cut_string 30 "$RELEASENAME")" ; RELEASENAME="$(extend_string_end 30 "$RELEASENAME")" + RELEASE_INFO="$GRML_NAME $VERSION - Release Codename $RELEASENAME" + RELEASE_INFO="$(cut_string 68 "$RELEASE_INFO")" + RELEASE_INFO="$(extend_string_end 68 "$RELEASE_INFO")" + + sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_TARGET"/GRML/grml-version + sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/GRML/grml-version - sed -i "s/%VERSION%/$VERSION/" "$BUILD_TARGET"/boot/isolinux/boot.msg - sed -i "s/%RELEASENAME%/$RELEASENAME/" "$BUILD_TARGET"/boot/isolinux/boot.msg - sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/boot/isolinux/boot.msg + sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_TARGET"/boot/isolinux/boot.msg + sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/boot/isolinux/boot.msg - sed -i "s/%VERSION%/$VERSION/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg - sed -i "s/%RELEASENAME%/$RELEASENAME/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg - sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg + sed -i "s/%RELEASE_INFO%/$RELEASE_INFO/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg + sed -i "s/%DATE%/$ISO_DATE/" "$BUILD_TARGET"/boot/isolinux/boot-beep.msg - sed -i "s/%VERSION%/$VERSION/" "$BUILD_TARGET"/boot/grub/menu.lst + sed -i "s/%VERSION%/$VERSION/" "$BUILD_TARGET"/boot/grub/menu.lst + sed -i "s/%GRML_NAME%/$GRML_NAME/" "$BUILD_TARGET"/boot/grub/menu.lst # autostart for Windows: - cp /usr/share/grml-live/windows/autostart/autorun.bat "$BUILD_TARGET"/ - cp /usr/share/grml-live/windows/autostart/autorun.inf "$BUILD_TARGET"/ - cp /usr/share/grml-live/windows/autostart/autorun.pif "$BUILD_TARGET"/ - cp /usr/share/grml-live/windows/autostart/cdrom.ico "$BUILD_TARGET"/ + cp /usr/share/grml-live/templates/windows/autostart/* "$BUILD_TARGET"/ # windows-binaries: if [ -n "$WINDOWS_BINARIES" ] ; then if [ -f "$BUILD_TARGET"/windows/putty.exe ] ; then @@ -354,11 +359,15 @@ else log "Finished execution of stage 'squashfs' [$(date)]" einfo "Finished execution of stage 'squashfs'" ; eend 0 fi + +# create md5sum file: +( cd $BUILD_TARGET/GRML && +find .. -type f -not -name md5sums -exec md5sum {} \; > md5sums ) # }}} # ISO_TARGET - mkisofs {{{ [ -n "$ISO_TARGET" ] || ISO_TARGET="$TARGET/grml_isos" -[ -n "$ISO_NAME" ] || ISO_NAME="grml_${VERSION}.iso" +[ -n "$ISO_NAME" ] || ISO_NAME="$GRML_NAME_${VERSION}.iso" if [ "$BOOT_METHOD" = "isolinux" ] ; then BOOT_FILE="boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat" diff --git a/templates/GRML/LICENSE.txt b/templates/GRML/LICENSE.txt new file mode 100644 index 0000000..84836cc --- /dev/null +++ b/templates/GRML/LICENSE.txt @@ -0,0 +1,356 @@ +================================================================== +The grml software collection and all included programs that are +authored by the grml-team, are subject to the terms and conditions +of the GNU GENERAL PUBLIC LICENSE Version 2 or any later version, +as quoted herein. + +Please note that this license does NOT automatically apply to +third-party programs included on this CD. Check +/usr/share/doc/*/copyright* and other supplied license files +of each software package carefully for more information. + +Information regarding the sources of this ISO can be found at +http://sources.grml.org/ +================================================================== + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. +================================================================== diff --git a/templates/GRML/README.txt b/templates/GRML/README.txt new file mode 100644 index 0000000..075b83f --- /dev/null +++ b/templates/GRML/README.txt @@ -0,0 +1,27 @@ +Security considerations for grml +================================ + +1.) There is no automatic start of external accessible services in Live-CD + mode. (sshd is started by default on harddisk installations though.) + +2.) There are no default passwords. All accounts are locked by default. + Even local logins are not possible (unless you set a password or create + new user accounts as root). + +3.) Therefore, all local interactive processes are started by init without + authorization. + Programs that only work for root are usually started using sudo without + password. This has the advantage of making faults caused by defective + software very unlikely, but does not enhance local security, since it + is fairly easy to switch between the "grml" and "root" account. The + grml user should never be allowed for external logins (in the case + that sshd or similar servers are being launched). + +4.) You can create valid passwords using "sudo passwd [username]" from the + shell, individually. + +GRML squashfs file +================== + +The GRML squashfs file has been moved from /GRML/GRML to +/live/grml.squashfs due to the use of live-initramfs. diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt new file mode 100644 index 0000000..894f3ed --- /dev/null +++ b/templates/GRML/grml-cheatcodes.txt @@ -0,0 +1,255 @@ + CHEATCODES AND HINTS FOR GRML +============================================================================== + +These options (can be combined) work from the (isolinux/grub) bootprompt: + +grml Use default settings (same as just pressing return) +memtest Run Memtest86+ instead of Linux +fb1280x1024 Use fixed framebuffer graphics (1) +fb1024x768 Use fixed framebuffer graphics (2) [notice: grml's default] +fb800x600 Use fixed framebuffer graphics (3) +nofb Disable framebuffer +floppy Boot from floppydisk +hd / hd1 / hd2 / hd3 Boot from (local) primary / secondary /... harddisk +failsafe Boot with (almost) no HW-detection +debug Get shells during process of booting for debugging +bootchart Create chart of booting sequence in /var/log/bootchart.tgz +forensic Do not touch any harddisks during hardware recognition +splash Text based bootsplash +serial Activate ttyS0 and start mgetty +dos Boot FreeDOS +grub Boot into the Grub bootloader +qemu Boot with special options for use in Qemu +vmware Boot with special options for use in VMware + +Important: if you notice any problems with one of the +following options please report it to the grml-team: +http://grml.org/bugs/ + +Notice: not all of the following cheatcodes are available on all the grml flavours. +For example the X window system is not part of grml-small. + +Regional settings: +------------------ +grml lang=at|de|cn|da|es|fr|it Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard +grml lang=nl|pl|ru|sk|tr|tw|us Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard +grml lang=$LANG-iso Activate $LANG (use like in lines above) with iso-mode instead of utf8 +grml gmt Use GMT-based time +grml tz=Europe/Vienna Use this timezone for TZ +grml keyboard=us xkeyboard=us Use different keyboard layout (text-console/X) +grml setkeycodes Set some special function keys for MS/HP keyboards + +Configuration settings: +----------------------- +grml myconfig=/dev/fd0 Execute "grml.sh" and extract config.tbz from a partition: + /dev/fd0 for floppy disk + /dev/sda1 for USB-stick/first SCSI-device +grml netconfig=server/config.tbz Download file and extract configuration archive +grml partconf=/dev/hda2 Copy files specified in /etc/grml/partconf from /dev/hda2 + to booting grml system +grml file=foobar.tbz Use specified file as name for configuration archive + instead of the default one (config.tbz) +grml extract=/etc Extract only /etc from configuration archive, + use it in combination with myconfig or netconfig +grml home=/dev/hda2 Mount specified partition as grml homedir +grml home=/dev/sda1/grml.img Mount loopback file as /home/grml +grml home=scan Automatic search for grml homedir (using file grml.img) +grml hostname=... Set hostname +grml debnet Search through local partitions for file /etc/network/interfaces, + copy /etc/network to local system and restart networking then +grml distri=... Set distribution name to given argument. If a jpg file named like the + given distri name can be found in directory desktop on the ISO + (/cdrom/desktop/"$DISTRI") it will be taken as wallpaper for grml +grml unionfs Use unionfs instead of aufs as overlay filesystem + +Notice: Take a look at http://grml.org/config/ and +/usr/share/doc/grml-saveconfig/grml-config.html +for more information regarding the configuration +framework of grml. + +Booting related options: +------------------------ +grml toram Copy CD to RAM and run from there +grml tohd=/dev/hda1 Copy CD to HD partition and run from there +grml fromhd Skip checking for grml on CD-ROM +grml fromhd=/dev/hda1 Boot from previously copied CD-Image +grml bootfrom=/dev/hda1 Access Image then boot from previously + copied CD-Image +grml bootfrom=/dev/hda1/GRML.iso Access image, boot from ISO-Image +grml grml_dir=GRML Directory to search for on the CD +grml grml_name=GRML SquashFS-File to search for on the CD + +Debugging related settings: +--------------------------- +debug Get shells during process of booting +grml nocolor Disable colorized output while booting +grml log Log error messages while booting and +grml testcd Check CD data integrity and md5sums + +Service related settings: +------------------------- +grml ssh=password Set password for user grml and start ssh-server +grml startup=script Start $script instead of grml-quickconfig on startup +grml nosyslog Do not start syslog-ng +grml nogpm Disable GPM daemon +grml noblank Disable console blanking +grml small Do not start that many consoles +grml wondershaper=eth0,1000,500 Set up basic traffic shaping +grml services={postfix,mysql,...} Start service(s) which have an init-script (/etc/init.d/) +grml welcome Welcome message via soundoutput +grml noeject Do NOT eject CD after halt/reboot +grml noprompt Do NOT prompt to remove the CD when halting/rebooting the system +grml distcc=$NETWORK,$INTERFACE Activate distcc-daemon to listen on specified network + and interface, usage example: + distcc=192.168.0.1/24,eth0 +grml gcc=3.4 gpp=3.4 Link /usr/bin/gcc, /usr/bin/cpp and /usr/bin/c++ to specified version +grml startx{=windowmanager} Start X window system automatically + Default window manager (if not provided): wm-ng (wrapper around fluxbox) + +Accessibility related settings: +------------------------------- +grml blind Start Braille-Terminal (no X) +grml swspeak Prepare system for use with software synthesizer through speakup + Run 'swspeak' after booting up to activate sound output +grml brltty=type,port,table Parameters for Braille device (e.g.: brltty=al,/dev/ttyS0,text.de.tbl) +grml speakup_synth=... Use speakup kernel module with given hardware type + +Hardware related settings: +-------------------------- +grml swap Activate present/detected swap partitions +grml noswraid Disable scanning for software raid arrays (creates /etc/mdadm/mdadm.conf) +grml swraid Enable automatic assembling of software raid arrays +grml nolvm Disable scanning for Logical Volumes (LVM) +grml lvm Automatically activate Logival Volumes (LVM) during boot +grml scandelay[=seconds] Delay accessing ISO-device (useful for booting via usb/firewire) +grml cdrom=/dev/... Use specifed device as CD-ROM device (used for mounting the grml-ISO) +grml xmodule=ati|fbdev|i810|mga Use specified X.org-Module (1) +grml xmodule=nv|radeon|savage|s3 Use specified X.org-Module (2) +grml xmodule=radeon|svga|i810 Use specified X.org-Module (3) +grml no{acpi,agp,apm,cpu,dhcp} Skip parts of HW-detection (1) +grml no{dma,fstab,modem} Skip parts of HW-detection (2) +grml no{pcmcia,scsi,swap,usb} Skip parts of HW-detection (3) +grml 915resolution=... Start resolution modify tool for Intel graphic chipset + usage: $MODE,$XRESO,$YRESO +grml blacklist=modulename Completely disable loading of specified module via + blacklisting through /etc/modprobe.d/grml +grml fwtimeout=50 Set firmware timeout via /sys/class/firmware/timeout to specified value +grml nosound Mute sound devices (notice: this does not deactivate loading of sound drivers!) +grml vol=number Set mixer volumes to level $number +grml pnpbios=off No PnP Bios initialization +grml acpi=off Disable ACPI Bios completely +grml nousb2 Disable initialization of USB 2.x controller(s) +grml nousb Disable initialization of USB in booting sequence +grml nofirewire Disable initialization of firewire devices in booting sequence +grml pci=irqmask=0x0e98 Try this, if PS/2 mouse doesn't work *) +grml pci=bios Workaround for bad PCI controllers +grml ide2=0x180 nopcmcia Boot from PCMCIA-CD-ROM (some notebooks) +grml mem=128M Specify Memory size in MByte +grml dma Enable DMA accelleration for ALL IDE-Drives +grml nodma ide=nodma Disable DMA accelleration for ALL IDE-Drives +grml vga=normal [video=ofonly] No-framebuffer mode (does not influence X) +grml vga=ask [video=ofonly] Display menu for framebuffer mode + +Installation related settings: +------------------------------ + +Caution: do *not* use the grml2hd and/or debian2hd bootoption if you do not know what you are doing! + +Install plain Debian via debian2hd bootoption (which runs grml-debootstrap in non-interactive mode): + +debian2hd ... whereas valid options for debian2hd are: + + target= target partition/directory of the new Debian system, e.g.: target=/dev/hda1 + grub= where to install grub to? Use grub syntax for specifying, e.g.: grub=hd0 + groot= specify root device for usage in grub (use grub syntax), e.g.: groot=hd0,0 + release= specify release of new Debian system (default is stable), e.g.: release=sid + mirror= specify mirror for apt-get/aptitude, e,g.: mirror=ftp://ftp.tugraz.at/mirror/debian + password= set passwort of user root without prompting for it, e.g.: password=AiTh5ahn + + Usage example for automatic installation: + debian2hd target=/dev/hda1 grub=hd0 groot=hd0,0 mirror=ftp://ftp.tugraz.at/mirror/debian password=foobar + + See http://grml.org/grml-debootstrap/ for more information. + +Install grml via grml2hd bootoption (which runs grml2hd in non-interactive mode): + +grml2hd ... whereas valid options for grml2hd are: + + user= user name for user which should be used at hd-install + filesystem={ext2|ext3|reiserfs|reiser4|jfs|xfs} filesystem to be used + mbr=/dev/... partition where MBR should be installed (default:=partition) + partition=/dev/... partition where grml should be installed + + Usage example for booting: + grml2hd partition=/dev/hda4 mbr=/dev/hda filesystem=ext3 user=mika + + Passwords of user root and user are "grml" - please adjust after hd-install! + + See http://grml.org/grml2hd/ for more information. + +Additional notes: +----------------- + +*) Try "grml pci=irqmask=0x0e98" if (you have a notebook and) your +PS/2 mouse doesn't work. (Possibly caused by a BIOS-flaw on your board, +BIOS updates can help.) Sometimes, switching to the text console with +Control-Alt-F1 and back to the X-screen with Control-Alt-F7 solves the +problem without rebooting, since the X server reinitializes the mouse +driver during that procedure. + +*) Bootfrom needs access to a running grml-System with the same Kernel +as the Bootkernel, before it is able to mount the partition / ISO-Image. +This should allow a poor mans install from NTFS-Partitions and makes it +also possible to boot an ISO-Image directly. You can also use wildcards +in the ISO-Filename, but it must be unique. So: If you have just one +grml.iso on /dev/hda1 you can access it as: bootfrom=/dev/hda1/G*.iso, +but if there are several, you need to make clear, which one you want. +(Feature added by Fabian Franz.) + +*) If your grml-CD makes strange noises during boot, or you see frequent +errors like "squashfs: read error", or programs are crashing randomly, +then your CD image is probably defective or incomplete, or your CD-burner +created a defective CD due to wrong writing speed or bad media. This is +the most common error reported. Please boot with "grml testcd" to check +if the CD is OK, and/or even better, verify the MD5 checksums that are +present on the mirrors before writing the CD. Check your CD low-level +via running 'readcd -c2scan dev=/dev/cdrom'. In some cases, defective +IDE controllers cause this error if you have DMA enabled. Also, please +read the grml-FAQ. + +*) In case of a failing hardware autodetection, try booting with any of +the "no-" options as shown in the table above, like in + grml noagp noapm noapic acpi=off nodma +to skip some critical parts of the autodetection system. + +*) Some boards apparently don't pass the proper memory size to the +linux-kernel. It may cause the message "Panic: cannot mount root file +system" and the system hangs. Use "grml mem=128M" to solve that +problem if your system has 128MByte memory for example (caution: +you MUST use a capital "M" here). + +*) The "myconfig=/dev/partition" option allows you to reconfigure the +system after autoconfiguration by running a bourne shell script called +"grml.sh" and/or extracting configuration files from a file named +config.tbz from the root directory on the given device (or floppy). +Take a look at http://grml.org/config/ for more information regarding +the configuration framework of grml. + +*) If you wish to remaster the CD, please don't forget to specify + + -no-emul-boot -boot-load-size 4 -boot-info-table \ + -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat + +as option to mkisofs. Otherwise your CD won't be bootable. The +directory GRML, containig the compressed filesystem file "GRML", +must be located in the top level directory of the CD. + +*) Caution: screensavers: Don't start xlock/vlock or any other screensaver +that requires a password. There are no default passwords on grml, +i.e. all accounts are LOCKED unless you explicitly set a password. +See also README_Security.txt about this issue. +Hint: If you accidentially started a screensaver switch to one of the +textconsoles by Control-Alt-F1 and kill the screensaver (or just set a +password for the grml user). Take a look at the script grml-lock. + +# EOF diff --git a/templates/GRML/grml-version b/templates/GRML/grml-version new file mode 100644 index 0000000..0420380 --- /dev/null +++ b/templates/GRML/grml-version @@ -0,0 +1 @@ +%RELEASE_INFO% [%DATE%] diff --git a/templates/GRML/images/button.png b/templates/GRML/images/button.png new file mode 100644 index 0000000..83e283e Binary files /dev/null and b/templates/GRML/images/button.png differ diff --git a/templates/GRML/images/favicon.png b/templates/GRML/images/favicon.png new file mode 100644 index 0000000..62de3c7 Binary files /dev/null and b/templates/GRML/images/favicon.png differ diff --git a/templates/GRML/images/linux.jpg b/templates/GRML/images/linux.jpg new file mode 100644 index 0000000..e63d2c5 Binary files /dev/null and b/templates/GRML/images/linux.jpg differ diff --git a/templates/GRML/images/logo.png b/templates/GRML/images/logo.png new file mode 100644 index 0000000..093a089 Binary files /dev/null and b/templates/GRML/images/logo.png differ diff --git a/templates/GRML/index.html b/templates/GRML/index.html new file mode 100644 index 0000000..3543dbc --- /dev/null +++ b/templates/GRML/index.html @@ -0,0 +1,157 @@ + + + +grml.org - Linux Live-CD for sysadmins and texttool-users + + + + + + + +

Online-Links:

HOME

+ +

Search for:

+ + +

Sitemap

+ +

grml - Linux for geeks

+ +

What is grml?

+ +

grml is a bootable CD (Live-CD) originally based on Knoppix and nowadays + based on Debian. grml includes + a collection of GNU/Linux software especially for users of + texttools and system administrators. grml provides automatic + hardware detection. You can use grml (for example) as a rescue + system, for analyzing systems/networks or as a working environment. + It is not necessary to install anything to a harddisk; you don't + even need a harddisk to run it. Due to on-the-fly decompression + grml includes about 2.1 GiB of software and documentation on the + CD. You don't have to pay anything to use grml because it is free + software!

+ +

Windows-Software

+ +

Notice

+ +

If you want to download and/or use 'grml' you have to accept the + following agreement:

+ +

Use this software at your own risk. Authors of grml can not + under any circumstances be held liable for damage to hard- or + software, lost data or other direct or indirect damage resulting + from the use of this software. In some countries the contained + cryptographic software or other components on the CD are governed + by export regulations or restrictions and thus may not be freely + used or copied as otherwise normal for software licensed under the + GPL. If you do not agree with these conditions, you are not + permitted to use or further distribute this software. If you plan + to commercially use or sell the software, you have to acquire the + necessary licenses and permissions from the software copyright + holders of the non-free software components, or remove them from + your distribution.

+ +

Information regarding the sources of this ISO can be found at grml.org/sources/.

+ +

Please verify the proper download of the image with the supplied + MD5-hash and check your CD with readcd! Check out the + problems webpage in the grml-wiki for further + information.

+ +

+ +

+ +

+ + diff --git a/templates/GRML/style.css b/templates/GRML/style.css new file mode 100644 index 0000000..fbf18e9 --- /dev/null +++ b/templates/GRML/style.css @@ -0,0 +1,63 @@ +/* This stylesheet was created by Michael Prokop for grml.org */ +/* Design was inspired by TeZeuZ - http://alumnos.elo.utfsm.cl/~osrehe - thx! */ + +@media all { + abbr[title] {border-bottom: 0px} + a {color:#C70036; text-decoration: underline} + acronym[title] {border-bottom: 1px dashed #000} + a.current {color:#999999} + a:hover {text-decoration: underline} + a.plain {text-decoration: none} + a.plain:hover {text-decoration: underline} + a.smalllink {font-size: 80%} + body {font-family: verdana, tahoma, helvetica, arial, sans-serif; font-size: 100%; background-color:#FFDA62; margin: 1em} + cite {font-size: 80%} + div.container {width: 90%; height: auto; text-align: left; background-color:#FFFFFF; border-style:solid; border-width:1px; border-color:#CFB8B8; margin: 0px auto 0px auto} + div.content {background-color:#FFFFFF; padding: 0.5em 0.5em 0.5em 0.5em; border-style:solid; border-width:1px; border-color:#F0F0F0; margin: 0.5em 0.5em 0.5em 12.2em} + div.content h3 a {color:#996666} + div.copyright {line-height: 3em; text-align:center; font-size:50%; background-color: #F8F8F8; color: #999999} + div.menu h3 a{color:#996666} + div.menu h3{font-size:70%; border-top-style:solid; border-top-width:1px; border-top-color:#E5E5E5; margin-bottom: -1em; border-bottom-width:0px} + div.menu {width: 10em; float: left; clear: left; background-color:#FFFFFF; padding: 0.5em 0.5em 0.5em 0.5em; border-style:solid; border-width:1px; border-color:#E5E5E5; margin: 0.5em 0.5em 0em 0.3em} + div.news a {font-weight:bold} + div.news {background-color:#FFFFFF; padding: 0em 0.5em 0.5em 0.5em; border-style:solid; border-width:1px; border-color:#E5E5E5; margin: 0em 0.5em 0.5em 12.2em} + div.news h3 a {color:#996666} + div.sub_links a {color: #FFFFFF} + div.sub_links {margin-top:0.5em; text-align:center; color: #FFFFFF; font-size:55%; clear: both; background-color:#8B8D7B} + h1 {color:#00309C; font-size:110%; font-weight:bold} + /*h2 {color:#CC3300; font-size:90%; font-weight:bold} + h3 {color:#996666; font-size:70%; font-weight:bold; padding-bottom:0.3em; border-bottom-style:solid; border-bottom-width:1px; border-bottom-color:#CFB8B8;*/ + h2 {color:#9C6562; font-size:100%; font-weight:bold} + h3 {color:#996666; font-size:90%; font-weight:bold; padding-bottom:0.3em; border-bottom-style:solid; border-bottom-width:1px; border-bottom-color:#CFB8B8; + margin-bottom:0em} + p {text-align:justify; color:#666666; font-size: 70%; line-height: 1.5em} + ul {color:#666666; font-size:70%} + #texbox {} +/*div.search { + width: 10em; + float: left; + clear: left; + background-color:#FFFFFF; + padding: 0.5em 0.5em 0.5em 0.5em; + border-style:solid; border-width:1px; border-color:#E5E5E5; + margin: 0.5em 0.5em 0.3em 0.3em; +} +div.search h3{font-size:70%; border-bottom-width:0px} +.searchbox {font-size:70%; color:#666666; border-style:solid; border-width:1px; border-color:#E5E5E5; margin-bottom:0.5em} +div.copyright a {color: #AAA} + ul {font-size:70%; color:#666666; line-height: 1.5em; list-style: none} + .tablenoprint {display: none} + .nav {display: none} +*/ +} + +@media screen { + .active {background-color: #FFCC33} + .rahmen {background-color: #FEDB64; padding: 5px; border: 1px dotted black} + abbr[title], acronym[title] {cursor: help} +} + +@media print { + body {font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000} + .rahmen {padding: 5px; border: 1px dotted black} +} diff --git a/i386_files/boot/grub/menu.lst b/templates/boot/grub/menu.lst similarity index 73% rename from i386_files/boot/grub/menu.lst rename to templates/boot/grub/menu.lst index 3a46406..108d087 100644 --- a/i386_files/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -12,35 +12,35 @@ foreground = 000000 background = FFCC33 # define entries: -title grml %VERSION% - Default boot (using 1024x768 framebuffer) +title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer) kernel /boot/isolinux/linux26 lang=us apm=power-off vga=791 quiet boot=live nomce initrd /boot/isolinux/initrd.gz -title grml %VERSION% - without framebuffer +title %GRML_NAME% %VERSION% - without framebuffer kernel /boot/isolinux/linux26 lang=us apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce initrd /boot/isolinux/initrd.gz -title grml %VERSION% - with 1280x1024 framebuffer +title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer kernel /boot/isolinux/linux26 lang=us apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce initrd /boot/isolinux/initrd.gz -title grml %VERSION% - with 800x600 framebuffer +title %GRML_NAME% %VERSION% - with 800x600 framebuffer kernel /boot/isolinux/linux26 lang=us apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce initrd /boot/isolinux/initrd.gz -title grml %VERSION% - failsafe boot +title %GRML_NAME% %VERSION% - failsafe boot kernel /boot/isolinux/linux26 vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm initrd /boot/isolinux/initrd.gz -title grml %VERSION% - debug mode +title %GRML_NAME% %VERSION% - debug mode kernel /boot/isolinux/linux26 lang=us apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce initrd /boot/isolinux/initrd.gz -title grml %VERSION% - forensic mode +title %GRML_NAME% %VERSION% - forensic mode kernel /boot/isolinux/linux26 vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live initrd /boot/isolinux/initrd.gz -title grml %VERSION% - serial mode +title %GRML_NAME% %VERSION% - serial mode kernel /boot/isolinux/linux26 lang=us apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce initrd /boot/isolinux/initrd.gz @@ -51,6 +51,6 @@ title Boot FreeDOS kernel /boot/isolinux/memdisk initrd /boot/isolinux/balder10.imz -title grml %VERSION% - old boot method -kernel /boot/isolinux/linux26 ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" -initrd /boot/isolinux/minirt26.gz +# title %GRML_NAME% %VERSION% - old boot method +# kernel /boot/isolinux/linux26 ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs" +# initrd /boot/isolinux/minirt26.gz diff --git a/i386_files/boot/grub/splash.xpm.gz b/templates/boot/grub/splash.xpm.gz similarity index 100% rename from i386_files/boot/grub/splash.xpm.gz rename to templates/boot/grub/splash.xpm.gz diff --git a/i386_files/boot/grub/stage2_eltorito b/templates/boot/grub/stage2_eltorito similarity index 100% rename from i386_files/boot/grub/stage2_eltorito rename to templates/boot/grub/stage2_eltorito diff --git a/i386_files/boot/isolinux/allinone.img b/templates/boot/isolinux/allinone.img similarity index 100% rename from i386_files/boot/isolinux/allinone.img rename to templates/boot/isolinux/allinone.img diff --git a/i386_files/boot/isolinux/balder10.imz b/templates/boot/isolinux/balder10.imz similarity index 100% rename from i386_files/boot/isolinux/balder10.imz rename to templates/boot/isolinux/balder10.imz diff --git a/i386_files/boot/isolinux/boot-beep.msg b/templates/boot/isolinux/boot-beep.msg similarity index 60% rename from i386_files/boot/isolinux/boot-beep.msg rename to templates/boot/isolinux/boot-beep.msg index ae09864..11bb248 100644 --- a/i386_files/boot/isolinux/boot-beep.msg +++ b/templates/boot/isolinux/boot-beep.msg @@ -1,5 +1,5 @@ 17logo.16 Some information and boot options available via keys F2 - F10. http://grml.org/ -grml %VERSION% - Release Codename %RELEASENAME% %DATE% +%RELEASE_INFO% %DATE% diff --git a/i386_files/boot/isolinux/boot.msg b/templates/boot/isolinux/boot.msg similarity index 59% rename from i386_files/boot/isolinux/boot.msg rename to templates/boot/isolinux/boot.msg index 994db1e..c16d721 100644 --- a/i386_files/boot/isolinux/boot.msg +++ b/templates/boot/isolinux/boot.msg @@ -1,4 +1,4 @@ 17logo.16 Some information and boot options available via keys F2 - F10. http://grml.org/ -grml %VERSION% - Release Codename %RELEASENAME% %DATE% +%RELEASE_INFO% %DATE% diff --git a/i386_files/boot/isolinux/f10 b/templates/boot/isolinux/f10 similarity index 100% rename from i386_files/boot/isolinux/f10 rename to templates/boot/isolinux/f10 diff --git a/i386_files/boot/isolinux/f2 b/templates/boot/isolinux/f2 similarity index 100% rename from i386_files/boot/isolinux/f2 rename to templates/boot/isolinux/f2 diff --git a/i386_files/boot/isolinux/f3 b/templates/boot/isolinux/f3 similarity index 100% rename from i386_files/boot/isolinux/f3 rename to templates/boot/isolinux/f3 diff --git a/i386_files/boot/isolinux/f4 b/templates/boot/isolinux/f4 similarity index 100% rename from i386_files/boot/isolinux/f4 rename to templates/boot/isolinux/f4 diff --git a/i386_files/boot/isolinux/f5 b/templates/boot/isolinux/f5 similarity index 100% rename from i386_files/boot/isolinux/f5 rename to templates/boot/isolinux/f5 diff --git a/i386_files/boot/isolinux/f6 b/templates/boot/isolinux/f6 similarity index 100% rename from i386_files/boot/isolinux/f6 rename to templates/boot/isolinux/f6 diff --git a/i386_files/boot/isolinux/f7 b/templates/boot/isolinux/f7 similarity index 100% rename from i386_files/boot/isolinux/f7 rename to templates/boot/isolinux/f7 diff --git a/i386_files/boot/isolinux/f8 b/templates/boot/isolinux/f8 similarity index 100% rename from i386_files/boot/isolinux/f8 rename to templates/boot/isolinux/f8 diff --git a/i386_files/boot/isolinux/f9 b/templates/boot/isolinux/f9 similarity index 100% rename from i386_files/boot/isolinux/f9 rename to templates/boot/isolinux/f9 diff --git a/i386_files/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg similarity index 100% rename from i386_files/boot/isolinux/isolinux.cfg rename to templates/boot/isolinux/isolinux.cfg diff --git a/i386_files/boot/isolinux/logo.16 b/templates/boot/isolinux/logo.16 similarity index 100% rename from i386_files/boot/isolinux/logo.16 rename to templates/boot/isolinux/logo.16 diff --git a/i386_files/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg similarity index 100% rename from i386_files/boot/isolinux/syslinux.cfg rename to templates/boot/isolinux/syslinux.cfg diff --git a/windows/autostart/autorun.bat b/templates/windows/autostart/autorun.bat similarity index 100% rename from windows/autostart/autorun.bat rename to templates/windows/autostart/autorun.bat diff --git a/windows/autostart/autorun.inf b/templates/windows/autostart/autorun.inf similarity index 100% rename from windows/autostart/autorun.inf rename to templates/windows/autostart/autorun.inf diff --git a/windows/autostart/autorun.pif b/templates/windows/autostart/autorun.pif similarity index 100% rename from windows/autostart/autorun.pif rename to templates/windows/autostart/autorun.pif diff --git a/windows/autostart/cdrom.ico b/templates/windows/autostart/cdrom.ico similarity index 100% rename from windows/autostart/cdrom.ico rename to templates/windows/autostart/cdrom.ico

Online-Links:

HOME

About

News

Getting grml

Documentation