Merge branch 'develop' into next
This commit is contained in:
commit
fb24a249cb
@ -35,7 +35,7 @@ install:
|
||||
- cd cmake
|
||||
- cmake --version
|
||||
# Use /dev/urandom when /dev/random is accessed, because travis doesn't have enough entropy
|
||||
- sudo cp -a /dev/urandom /dev/random
|
||||
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo cp -a /dev/urandom /dev/random; fi
|
||||
script:
|
||||
- cmake .. -DBUILD_TESTING=on -DCMAKE_BUILD_TYPE=Debug
|
||||
- make -j$NUMCORES
|
||||
|
29
README.md
29
README.md
@ -8,36 +8,11 @@ See [https://www.cryfs.org](https://www.cryfs.org).
|
||||
Install latest release
|
||||
======================
|
||||
|
||||
Easy install (Ubuntu 17.04 and later, Debian Stretch and later)
|
||||
--------------------------------
|
||||
This only works for Ubuntu 17.04 and later, and Debian Stretch and later.
|
||||
You can also use CryFS on older versions of these distributions by following the **Building from source** instructions below.
|
||||
|
||||
sudo apt install cryfs
|
||||
|
||||
Manual install (older Ubuntu versions)
|
||||
-----------------------
|
||||
|
||||
# Add apt key
|
||||
wget -O - https://www.cryfs.org/apt.key | sudo apt-key add -
|
||||
|
||||
# Add apt repository
|
||||
sudo sh -c "echo \"deb http://apt.cryfs.org/ubuntu `lsb_release -s -c` main\" > /etc/apt/sources.list.d/cryfs.list"
|
||||
|
||||
# Install cryfs
|
||||
sudo apt-get update
|
||||
sudo apt-get install cryfs
|
||||
|
||||
Manual install (older Debian versions)
|
||||
-----------------------
|
||||
# Add apt key
|
||||
wget -O - https://www.cryfs.org/apt.key | sudo apt-key add -
|
||||
|
||||
# Add apt repository
|
||||
sudo sh -c "echo \"deb http://apt.cryfs.org/debian `lsb_release -s -c` main\" > /etc/apt/sources.list.d/cryfs.list"
|
||||
|
||||
# Install cryfs
|
||||
sudo apt-get update
|
||||
sudo apt-get install cryfs
|
||||
|
||||
GUI
|
||||
===
|
||||
Theres some GUI applications with CryFS support. You usually have to install the GUI **and** also CryFS itself for it to work.
|
||||
|
Loading…
Reference in New Issue
Block a user