From: Alexander Wirt Date: Tue, 10 Jan 2012 06:32:05 +0000 (+0100) Subject: Merge branch 'master' into nonophp X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=refs%2Fheads%2Fnonophp;hp=-c;p=grml.org.git Merge branch 'master' into nonophp --- d9a36a4197f11c71da6a6ae62e645eb53be5a166 diff --combined faq/index.html.tt2 index 0884e9d,372c9c7..a810e02 --- a/faq/index.html.tt2 +++ b/faq/index.html.tt2 @@@ -20,7 -20,7 +20,7 @@@ - +[% INCLUDE static.inc %]
@@@ -174,8 -174,10 +174,10 @@@

There are no default passwords - all accounts are locked by default for security reasons. Even local logins are not possible (unless you set a password or create new user - accounts as root). You can create valid passwords using "sudo - passwd [username]" from the shell individually.

+ accounts as root). You can create valid passwords using "sudo + passwd [username]" from the shell individually. To set a password + for the Grml user and enable SSH login you can use the 'ssh' + boot option, like 'ssh=yourpassword'.

How do I find out the version of Grml

@@@ -348,4 -350,4 +350,4 @@@ grml keyboard=de xkeyboard=de lang=at
- +[% INCLUDE static_bottom.inc %] diff --combined team/index.html.tt2 index b1df04f,09995a7..4ac9baf --- a/team/index.html.tt2 +++ b/team/index.html.tt2 @@@ -21,7 -21,7 +21,7 @@@ - +[% INCLUDE static.inc %]
@@@ -34,7 -34,6 +34,6 @@@
  • Andreas Gredler (jimmy)
  • Christian Hofstaedtler (ch)
  • Frank Terbeck (ft)
    • -
  • Gerfried Fuchs (rhonda)
  • Michael Prokop (mika)
  • Ulrich Dangel (mru)
    • @@@ -58,6 -57,7 +57,7 @@@
  • Carsten Hey
  • Christoph Biedl
  • Eduard Bloch
    • +
  • Gerfried Fuchs
  • Gregor Perner
  • Jan-Pieter Jacobs
  • Jens Kubieziel
    • @@@ -88,5 -88,4 +88,5 @@@
    - +[% INCLUDE static_bottom.inc %] +