Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
tails
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cody Brownstein
tails
Commits
6d5fc2a9
Commit
6d5fc2a9
authored
5 years ago
by
segfault
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugfix/16637-faster-mksquashfs' into devel (Closes: #16637)
parents
9f57027e
c448a322
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/chroot_apt/preferences
+4
-0
4 additions, 0 deletions
config/chroot_apt/preferences
vagrant/lib/tails_build_settings.rb
+1
-1
1 addition, 1 deletion
vagrant/lib/tails_build_settings.rb
with
5 additions
and
1 deletion
config/chroot_apt/preferences
+
4
−
0
View file @
6d5fc2a9
...
...
@@ -53,6 +53,10 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: squashfs-tools
Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
...
...
This diff is collapsed.
Click to expand it.
vagrant/lib/tails_build_settings.rb
+
1
−
1
View file @
6d5fc2a9
...
...
@@ -7,7 +7,7 @@ VIRTUAL_MACHINE_HOSTNAME = 'vagrant-stretch'
# Approximate amount of RAM needed to run the builder's base system
# and perform a build
VM_MEMORY_BASE
=
2
*
1024
VM_MEMORY_BASE
=
1.5
*
1024
# Approximate amount of extra space needed for builds
BUILD_SPACE_REQUIREMENT
=
12
*
1024
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment