Commit 6ca6366b authored by Tails developers's avatar Tails developers
Browse files

Remove/adjust a bunch of Wheezy-specific hacks and comments.

parent 0668c0fe
...@@ -56,5 +56,5 @@ sed -i -e '/^include stdmenu\.cfg/a include tails.cfg' "${CFG_FILE}" ...@@ -56,5 +56,5 @@ sed -i -e '/^include stdmenu\.cfg/a include tails.cfg' "${CFG_FILE}"
# no need to use absolute paths to find splash images # no need to use absolute paths to find splash images
sed -e 's,/isolinux/,,' -i "${SYSLINUX_PATH}/stdmenu.cfg" sed -e 's,/isolinux/,,' -i "${SYSLINUX_PATH}/stdmenu.cfg"
# remove useless files that break incremental upgrades on Wheezy # remove useless files that break incremental upgrades
rm "${SYSLINUX_PATH}"/{exithelp,prompt}.cfg rm "${SYSLINUX_PATH}"/{exithelp,prompt}.cfg
...@@ -59,7 +59,9 @@ install_tor_browser() { ...@@ -59,7 +59,9 @@ install_tor_browser() {
done done
# The libstdc++6 package in Wheezy is too old, so we need the # The libstdc++6 package in Wheezy is too old, so we need the
# bundled one. # bundled one. And even if it the one in Jessie isn't too old
# for the time being, better run Tor Browser with the library
# it's meant to work with.
cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}" cp "${prep}"/TorBrowser/Tor/libstdc++.so.6 "${prep}"
# We don't need the Tor binary, the shared libraries Tor needs # We don't need the Tor binary, the shared libraries Tor needs
......
...@@ -14,9 +14,6 @@ gcc_version=4.8 ...@@ -14,9 +14,6 @@ gcc_version=4.8
# the -dkms package must be installed *after* dkms to be properly registered # the -dkms package must be installed *after* dkms to be properly registered
apt-get install --yes build-essential dkms dpatch apt-get install --yes build-essential dkms dpatch
apt-get install --yes gcc-${gcc_version} apt-get install --yes gcc-${gcc_version}
# Versions of the module prior to 4.2 do not built on 3.8 and later [Debian #704130].
# Install version from Wheezy backports.
apt-get install --yes virtualbox-guest-utils virtualbox-guest-dkms virtualbox-guest-x11 apt-get install --yes virtualbox-guest-utils virtualbox-guest-dkms virtualbox-guest-x11
# Have the modules built for every installed kernel # Have the modules built for every installed kernel
......
# XXX: Remove this file when rebasing Tails on Jessie.
Section "ServerFlags"
Option "BlankTime" "0"
Option "StandbyTime" "0"
Option "SuspendTime" "0"
EndSection
#!/bin/sh #!/bin/sh
# Workaround for Tails#5672, that is Debian#578476.
# Can probably be dropped once we use Jessie.
python -c 'import gst'
# Start Pidgin with the GNOME integration disabled, so that the # Start Pidgin with the GNOME integration disabled, so that the
# "Global proxy configuration" is used, which we set to use Tor # "Global proxy configuration" is used, which we set to use Tor
exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin exec env GNOME_DESKTOP_SESSION_ID="" /usr/bin/pidgin
...@@ -394,9 +394,7 @@ EOF ...@@ -394,9 +394,7 @@ EOF
end end
def reset def reset
# ruby-libvirt 0.4 does not support the reset method. @domain.reset if is_running?
# XXX: Once we use Jessie, use @domain.reset instead.
system("virsh -c qemu:///system reset " + @domain_name) if is_running?
end end
def power_off def power_off
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment