From: Christian Hofstaedtler Date: Thu, 13 Oct 2011 21:24:12 +0000 (+0200) Subject: Remove grml-docs and install startpage with grml-live X-Git-Tag: v0.16.1~20 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=bfe1fbd4df16c2c92cbed7e19cb52b2d533bf61a Remove grml-docs and install startpage with grml-live --- diff --git a/etc/grml/fai/config/files/usr/share/doc/grml-docs/startpage.html/GRMLBASE b/etc/grml/fai/config/files/usr/share/doc/grml-docs/startpage.html/GRMLBASE new file mode 100644 index 0000000..5c5753c --- /dev/null +++ b/etc/grml/fai/config/files/usr/share/doc/grml-docs/startpage.html/GRMLBASE @@ -0,0 +1,83 @@ + + + + + + +grml.org - Linux for system administrators and users of texttools + + + + +

 

+ +

Welcome to your Grml system!

+ + + +

Grml is a Debian based Linux Live system for x86 and x86_64 systems. Its main +purpose is providing a system for system administrators and users of +texttools.

+ +

You are reading this page probably in the w3m or links browser on the console +or in xlinks2, dillo or firefox/iceweasel running under X. To switch between +links in w3m and links press the <tab>-key. You can move the cursor via +the cursor keys. 'B' is the key for going back one page in the browser history, +pressing 'H' brings you to the help of w3m. Press 'Q' for exiting w3m, links +and xlinks2.

+ +

Notice: if you find any bugs please report them to us! Thank you for helping +us to improve Grml!

+ +

Overview

+ + + +

Tips of the release: + +

+ +

Subscribe to the Grml mailinglist +and join #grml on irc.freenode.net!

+ +

Online resources

+ + + +

Press 'Q' for exiting the browsers w3m, links and xlinks2 or Ctrl-q for exiting dillo. +Have fun with Grml!

+ +

(C) 2004++ by the grml-team.

+ + + + diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL index 9e26bf0..70d02b2 100644 --- a/etc/grml/fai/config/package_config/GRML_FULL +++ b/etc/grml/fai/config/package_config/GRML_FULL @@ -18,7 +18,6 @@ PACKAGES aptitude ## grml specific packages {{{ grml-debugtools grml-desktop -grml-docs grml-feedback grml-live grml-paste diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM index 277ebb0..f76b7b2 100644 --- a/etc/grml/fai/config/package_config/GRML_MEDIUM +++ b/etc/grml/fai/config/package_config/GRML_MEDIUM @@ -59,7 +59,6 @@ gddrescue genext2fs grml-debugtools grml-desktop -grml-docs grml-feedback grml-live grml-paste diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL index 2a94ed1..adeae93 100644 --- a/etc/grml/fai/config/package_config/GRML_SMALL +++ b/etc/grml/fai/config/package_config/GRML_SMALL @@ -38,7 +38,6 @@ e3 ed ethtool findutils -grml-docs grml-feedback grml-paste grml-quickconfig-standard diff --git a/etc/grml/fai/config/scripts/GRMLBASE/42-branding b/etc/grml/fai/config/scripts/GRMLBASE/42-branding old mode 100644 new mode 100755 index 70b43b8..1cf727d --- a/etc/grml/fai/config/scripts/GRMLBASE/42-branding +++ b/etc/grml/fai/config/scripts/GRMLBASE/42-branding @@ -1,6 +1,6 @@ #!/bin/bash # Filename: ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/42-branding -# Purpose: install wallpaper +# Purpose: install branding files # 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. @@ -10,6 +10,7 @@ set -u set -e fcopy -v /usr/share/grml/desktop.jpg +fcopy -v /usr/share/doc/grml-docs/startpage.html ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information index f1196de..f9495fe 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/95-package-information +++ b/etc/grml/fai/config/scripts/GRMLBASE/95-package-information @@ -15,10 +15,6 @@ HOSTNAME='' [ -n "$HOSTNAME" ] || HOSTNAME=grml PACKAGE_LOG=/var/log/fai/"$HOSTNAME"/last/ -# generate the package list and store it on the ISO itself for grml-docs: -[ -d $target/usr/share/doc/grml-docs/packages ] || mkdir -p $target/usr/share/doc/grml-docs/packages -COLUMNS=200 $ROOTCMD dpkg --list > $target/usr/share/doc/grml-docs/packages/dpkg_list - if ! [ -w "$PACKAGE_LOG" ] ; then echo "Error: can not write to ${PACKAGE_LOG}. Exiting.">&2 exit 1