Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always force the use latest kernel by default #3857

Merged
merged 1 commit into from
Oct 11, 2018
Merged

Always force the use latest kernel by default #3857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install_files/ansible-base/group_vars/all/securedrop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ securedrop_cond_reboot_file: /tmp/sd-reboot-now

# If you bump this, also remember to bump in molecule/builder/tests/vars.yml
securedrop_pkg_grsec:
ver: "4.4.144"
ver: "4.4.144-1"
depends: "linux-image-3.14.79-grsec,linux-image-4.4.135-grsec,linux-firmware-image-4.4.135-grsec,linux-image-4.4.144-grsec,linux-firmware-image-4.4.144-grsec"
15 changes: 5 additions & 10 deletions install_files/securedrop-grsec/DEBIAN/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@ set -x
case "$1" in
configure)

# If the SecureDrop instance is running a rolled-back kernel, this will
# preserve the kernel boot priority specfied in its ordinal form by the
# canonical form. (In this specific case, 1>2 as GRUB_DEFAULT in
# /etc/default/grub indicates the instance is running 3.14.79-grsec)
# In any other case, we want to run the latest 4.4 series kernel.
if grep -qE "^GRUB_DEFAULT=[\"\' ]*1>2[\"\' ]*$" /etc/default/grub; then
sed -i "s/^\(GRUB_DEFAULT=\)[\"\' ]*1>2[\"\' ]*$/\1\"Advanced options for Ubuntu>Ubuntu, with Linux 3.14.79-grsec\"/" /etc/default/grub
# update grub to set the new default
update-grub2
fi
# Replace the default GRUB boot option with 0, which defaults to the
# highest kernel version. Any kernel provided by apt.freedom.press must
# suprecede the ones provided by Ubuntu.
sed -i '/^GRUB_DEFAULT=/s/=.*/=0/' /etc/default/grub
update-grub
;;

abort-upgrade|abort-remove|abort-deconfigure)
Expand Down
2 changes: 1 addition & 1 deletion molecule/builder/tests/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ securedrop_version: "0.10.0~rc1"
ossec_version: "3.0.0"
keyring_version: "0.1.2"
config_version: "0.1.1"
grsec_version: "4.4.144"
grsec_version: "4.4.144-1"

# These values will be interpolated with values populated above
# via helper functions in the tests.
Expand Down