Skip to content
Snippets Groups Projects
Commit 5e13941d authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'devel' into security/vidalia_in_its_own_user

parents 3e1eb563 f0fae7d4
No related branches found
No related tags found
No related merge requests found
Tails-specific: reload CUPS configuration to take into account persistent printers
--- chroot.orig/etc/gdm3/PostLogin/Default 2013-07-23 12:51:28.436000000 +0000
+++ chroot/etc/gdm3/PostLogin/Default 2013-07-23 13:09:07.476000000 +0000
@@ -110,6 +110,11 @@
log_n_exit "'/usr/local/sbin/tails-additional-software' does not exist or is not executable."
fi
+# Reload CUPS configuration to take persistent printers into account if necessary
+if $(grep '/etc/cups' /live/persistence/*_unlocked/live-persistence.conf > /dev/null); then
+ service cups force-reload
+fi
+
### Password
# Import password for superuser access
...@@ -117,6 +117,14 @@ fi ...@@ -117,6 +117,14 @@ fi
as_root_do lb build as_root_do lb build
if [ -n "$JENKINS_URL" ]; then
ISO=$(ls *.iso)
for file in tails-*; do
sha512sum "$file" >> "$ISO.shasum"
done
gpg --batch --detach-sign --armor "$ISO.shasum"
fi
mv -f tails-* "$ARTIFACTS_DIR" mv -f tails-* "$ARTIFACTS_DIR"
if [ "$TAILS_BOOTSTRAP_CACHE" ] && \ if [ "$TAILS_BOOTSTRAP_CACHE" ] && \
......
...@@ -27,6 +27,7 @@ This is relevant for the following applications: ...@@ -27,6 +27,7 @@ This is relevant for the following applications:
- iceweasel bookmarks - iceweasel bookmarks
- Pidgin configuration - Pidgin configuration
- MUA configuration - MUA configuration
- printers configuration
- Tor's data/cache for faster bootstrap with slow connections and - Tor's data/cache for faster bootstrap with slow connections and
better protections through more stable entry guards better protections through more stable entry guards
(`/var/lib/tor/`); beware, this breaks tordate (`/var/lib/tor/`); beware, this breaks tordate
......
...@@ -64,7 +64,7 @@ manage your OpenPGP keys</div> ...@@ -64,7 +64,7 @@ manage your OpenPGP keys</div>
<div class="icon"> <div class="icon">
[[!img gnome-dev-printer.png link=no]] [[!img gnome-dev-printer.png link=no]]
<div class="text"><strong>Administration</strong> → <strong>Printing</strong>: configure printers</div> <div class="text"><strong>Administration</strong> → <strong>Printing</strong>: configure printers, see [[Printing and scanning|sensitive_documents/printing_and_scanning]].</div>
</div> </div>
<div class="icon"> <div class="icon">
......
...@@ -229,6 +229,16 @@ When this feature is activated, changes to the bookmarks in the ...@@ -229,6 +229,16 @@ When this feature is activated, changes to the bookmarks in the
<span class="application">Iceweasel</span> web browser are saved in the persistent <span class="application">Iceweasel</span> web browser are saved in the persistent
volume. This does not apply to the Unsafe web browser. volume. This does not apply to the Unsafe web browser.
<a id="printers"></a>
<div class="icon">
[[!img printer.png link=no]]
<div class="text"><h2>Printers</h2></div>
</div>
When this feature is activated, the configuration of the printers is saved in the
persistent volume.
<a id="dotfiles"></a> <a id="dotfiles"></a>
<div class="icon"> <div class="icon">
......
wiki/src/doc/first_steps/persistence/printer.png

2.45 KiB

...@@ -48,8 +48,8 @@ Instructions ...@@ -48,8 +48,8 @@ Instructions
6. To start the installation, click on the <span class="button">Create Live 6. To start the installation, click on the <span class="button">Create Live
USB</span> button. USB</span> button.
7. Read the warning message in the text area. Click on the <span 7. Read the warning message in the pop-up window. Click on the <span
class="button">Next</span> button to confirm. class="button">Yes</span> button to confirm.
<div class="next"> <div class="next">
<p>After the installation completes, you can [[start Tails|/download/#start]] <p>After the installation completes, you can [[start Tails|/download/#start]]
......
...@@ -44,8 +44,8 @@ Clone & Upgrade ...@@ -44,8 +44,8 @@ Clone & Upgrade
6. To start the upgrade, click on the <span class="button">Create Live 6. To start the upgrade, click on the <span class="button">Create Live
USB</span> button. USB</span> button.
7. Read the warning message in the text area. Click on the <span 7. Read the warning message in the pop-up window. Click on the <span
class="button">Next</span> button to confirm. class="button">Yes</span> button to confirm.
<a id="from_iso"></a> <a id="from_iso"></a>
...@@ -85,5 +85,5 @@ Upgrade from ISO ...@@ -85,5 +85,5 @@ Upgrade from ISO
and, in the popup window, enter the passphrase to unlock it. and, in the popup window, enter the passphrase to unlock it.
</div> </div>
7. Read the warning message in the text area. Click on the <span 7. Read the warning message in the pop-up window. Click on the <span
class="button">Next</span> button to confirm. class="button">Yes</span> button to confirm.
[[!meta title="Printing and scanning"]] [[!meta title="Printing and scanning"]]
The [CUPS printing system](http://cups.org), which includes drivers for several common [[!toc]]
printers allows printing, while you can scan with [Simple
scan](https://launchpad.net/simple-scan) Printing
========
To configure a printer or manage your printing jobs choose
<span class="menuchoice">
<span class="guimenu">System</span>&nbsp;▸
<span class="guisubmenu">Administration</span>&nbsp;▸
<span class="guimenuitem">Printing</span></span>.
To check the compatibility of your printer with Linux and Tails, consult
the [OpenPrinting database](https://www.openprinting.org/printers) of
the Linux Foundation.
<div class="tip">
To reuse the configuration of the printers across separate working
sessions, you can activate the <span class="guilabel">[[Printers
persistent volume
feature|doc/first_steps/persistence/configure/#printers]].
</div>
Scanning
========
Tails includes <span class="application">[Simple
Scan](https://launchpad.net/simple-scan)</span>, a tool to scan both
documents and photos.
To start <span class="application">Simple Scan</span> choose
<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
<span class="guisubmenu">Graphics</span>&nbsp;▸
<span class="guimenuitem">Simple Scan</span></span>.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment