summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-08-11 12:55:02 +0000
committerintrigeri <intrigeri@boum.org>2015-08-11 13:36:01 +0000
commit49428393c98e76f429d071216bd034f7af60db2f (patch)
treeab86ed5ee8ed66541f68ae93a61155026590c57f /config/chroot_local-patches
parent72647c7b2c674c7488a32d8942562d1d692b9d94 (diff)
Unfuzzy a couple patches.
Diffstat (limited to 'config/chroot_local-patches')
-rw-r--r--config/chroot_local-patches/do-not-modify-hardware-clock.diff5
-rw-r--r--config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff9
-rw-r--r--config/chroot_local-patches/remount_persistence_filesystem_readonly_on_shutdown.patch3
3 files changed, 13 insertions, 4 deletions
diff --git a/config/chroot_local-patches/do-not-modify-hardware-clock.diff b/config/chroot_local-patches/do-not-modify-hardware-clock.diff
index ee1e6e5..588fffa 100644
--- a/config/chroot_local-patches/do-not-modify-hardware-clock.diff
+++ b/config/chroot_local-patches/do-not-modify-hardware-clock.diff
@@ -1,7 +1,7 @@
--- a/etc/init.d/hwclock.sh 2015-05-16 10:47:58.445109125 +0000
+++ b/etc/init.d/hwclock.sh 2015-05-16 10:48:20.140450601 +0000
-@@ -25,7 +25,7 @@
- # Required-Stop: $local_fs
+@@ -26,7 +26,7 @@
+ # Should-Stop: umountfs
# Default-Start: S
# X-Start-Before: checkroot
-# Default-Stop: 0 6
@@ -9,3 +9,4 @@
### END INIT INFO
# These defaults are user-overridable in /etc/default/hwclock
+
diff --git a/config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff b/config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff
index f0f0479..e3e7047 100644
--- a/config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff
+++ b/config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff
@@ -2,6 +2,13 @@ Tails specific: no need to stop properly on shutdown: we are amnesic.
--- chroot.orig/etc/init.d/laptop-mode 2012-09-24 10:05:13.073049110 +0200
+++ chroot/etc/init.d/laptop-mode 2012-09-24 10:47:23.717869294 +0200
-@@ -15,1 +15,1 @@
+@@ -11,7 +11,7 @@
+ # Required-Start: $remote_fs
+ # Required-Stop: $remote_fs
+ # Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Stop:
+ # Short-Description: Enable laptop-mode-tools power management functions
+ # Description: Enable laptop-mode-tools power management functions
+ ### END INIT INFO
+
diff --git a/config/chroot_local-patches/remount_persistence_filesystem_readonly_on_shutdown.patch b/config/chroot_local-patches/remount_persistence_filesystem_readonly_on_shutdown.patch
index 1d895de..6fcffef 100644
--- a/config/chroot_local-patches/remount_persistence_filesystem_readonly_on_shutdown.patch
+++ b/config/chroot_local-patches/remount_persistence_filesystem_readonly_on_shutdown.patch
@@ -2,7 +2,7 @@ diff --git a/bin/live-medium-cache b/bin/live-medium-cache
index f85b2b2..fec1496 100755
--- a/bin/live-medium-cache
+++ b/bin/live-medium-cache
-@@ -161,7 +161,7 @@ done
+@@ -75,7 +75,7 @@
mount -o remount,ro /lib/live/mount/overlay > /dev/null 2>&1
# Remounting any persistence devices read-only
@@ -11,3 +11,4 @@ index f85b2b2..fec1496 100755
do
mount -o remount,ro ${_MOUNT} > /dev/null 2>&1
done
+