summaryrefslogtreecommitdiff
path: root/pages/linux
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-01-10 11:53:57 -0500
committerMicah Anderson <micah@riseup.net>2017-01-10 11:53:57 -0500
commit2c5c3b1d9da2edad91cae783309e823d30a04be7 (patch)
tree8e48fc96dc1f5e57193ced3baa482b79d8ae54ab /pages/linux
parenta480b8d0f52ff1503b509a28c353520025b602a3 (diff)
Update linux instructions to include official debian keyring package
Diffstat (limited to 'pages/linux')
-rw-r--r--pages/linux/_via_packages.html.haml13
-rw-r--r--pages/linux/en.md2
2 files changed, 10 insertions, 5 deletions
diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml
index 3c0dae2..727318f 100644
--- a/pages/linux/_via_packages.html.haml
+++ b/pages/linux/_via_packages.html.haml
@@ -3,12 +3,18 @@
%p.b= t :to_install
%pre
- :preserve
+ - if @locals[:backport] == 'true'
+ Follow [[instructions for activating Debian Backports => https://backports.debian.org/Instructions]].
+ sudo -s
+ apt install -t #{@locals[:distro]}-backports leap-archive-keyring
+ \
+ - else
sudo -s
+ apt install leap-archive-keyring
+ :preserve
echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list
- wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
- apt install bitmask leap-archive-keyring
+ apt install bitmask
%p.b= t :to_remove
@@ -16,7 +22,6 @@
:preserve
sudo -s
apt remove bitmask leap-archive-keyring
- apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
%p.b= t :upgrade_os
diff --git a/pages/linux/en.md b/pages/linux/en.md
index 4602360..f1eb444 100644
--- a/pages/linux/en.md
+++ b/pages/linux/en.md
@@ -34,7 +34,7 @@ If you are using Wheezy, then you will need to use the bundle method.
### Debian 8 (Stable/Jessie)
-<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %>
+<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :backport => 'true'}) %>
### Debian Testing (Stretch)