diff options
| author | Simon Rettberg | 2013-12-02 16:11:15 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-02 16:11:15 +0100 |
| commit | d939629d9ab279cea1469b7af1355ef3ccbeb483 (patch) | |
| tree | b2f8c12b8efc1fd0e153709ee4404e6aeb3cf45a | |
| parent | [vmchooser] run-virt: busybox sort compatibility (diff) | |
| parent | [doc] setup_howto: Minor changes (diff) | |
| download | tm-scripts-d939629d9ab279cea1469b7af1355ef3ccbeb483.tar.gz tm-scripts-d939629d9ab279cea1469b7af1355ef3ccbeb483.tar.xz tm-scripts-d939629d9ab279cea1469b7af1355ef3ccbeb483.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rw-r--r-- | doc/setup_howto | 13 | ||||
| -rw-r--r-- | server/modules/cups-freiburg/etc/cups/printers.conf | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/doc/setup_howto b/doc/setup_howto index 5d516ea9..29056829 100644 --- a/doc/setup_howto +++ b/doc/setup_howto @@ -19,7 +19,9 @@ scripts, as e.g. needed packages will be installed automatically. 2. Source repositories openSLX main repository: git://git.openslx.org/openslx-ng/tm-scripts.git -printerGUI repository: git://git.openslx.org/openslx-ng/printergui.git + +There are some other git repositories needed by the build process, but they +will be automatically checked out, e.g. busybox or printergui. 3. Server prerequisites @@ -31,7 +33,9 @@ Needed services: dhcp, tftpd, httpd, NFS and/or dnbd3. checkout openSLX git repository: # git clone git://git.openslx.org/openslx-ng/tm-scripts.git -# git clone git://git.openslx.org/openslx-ng/printergui.git + +There are some other git repositories needed by the build process, but they +are automatically checked out, e.g. busybox or printergui. 5. Getting started @@ -208,8 +212,9 @@ localizations may be listed at [path to tm-scripts]/server/configs. 10. iPXE: TODO -## most probably not required as relevant features are available in recent -## Syslinux versions (6.0.0+) +This will be most probably not being required in the future, as relevant +features are available in recent Syslinux versions (6.0.0+). + 11. Stage 4 (extract Linux desktop environment) diff --git a/server/modules/cups-freiburg/etc/cups/printers.conf b/server/modules/cups-freiburg/etc/cups/printers.conf index 5ab768c8..9031ca2d 100644 --- a/server/modules/cups-freiburg/etc/cups/printers.conf +++ b/server/modules/cups-freiburg/etc/cups/printers.conf @@ -97,7 +97,7 @@ ErrorPolicy abort-job </Printer> <Printer UB1MONO> UUID urn:uuid:5a0b007f-9f3c-3fe3-49ae-246db5aa44e1 -Info UB1 Lernzentrum Schwarz-Weiß +Info UB1 Lernzentrum S/W Location UB1/Stadthalle MakeModel HP LaserJet P4010 Series Postscript (recommended) DeviceURI http://vm-pri.ruf.uni-freiburg.de:631/UB1MONO |