From 72aebf1e038039df93d0973de53f75369551d244 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 7 Sep 2012 13:41:40 +0200 Subject: [PATCH] Move changes to scripts/live-premount/readonly into debian patch file I wasn't aware that scripts/live-premount/readonly is upstream code nowadays, so to avoid "dpkg-source: error: aborting due to unexpected upstream changes" we need to provide it as patch file. --- ...o_not_check_for_forensic_in_readonly_mode.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + scripts/live-premount/readonly | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/38_do_not_check_for_forensic_in_readonly_mode.patch diff --git a/debian/patches/38_do_not_check_for_forensic_in_readonly_mode.patch b/debian/patches/38_do_not_check_for_forensic_in_readonly_mode.patch new file mode 100644 index 0000000..44332ea --- /dev/null +++ b/debian/patches/38_do_not_check_for_forensic_in_readonly_mode.patch @@ -0,0 +1,22 @@ +Description: readonly: do not check for "forensic" boot option + +Author: Michael Prokop + +We use the "readonly" boot option in the forensic boot menu entry, +so nothing will change from user's PoV. + +The "forensic" string might match in a different context though +and the "readonly" boot option was removed by intention to not +block write access to the devices. + +--- live-boot-3.0~a27.orig/scripts/live-premount/readonly ++++ live-boot-3.0~a27/scripts/live-premount/readonly +@@ -22,7 +22,7 @@ esac + + # make sure all harddisk devices are read-only + # this is important for forensic investigations +-if grep -qe forensic -qe readonly /proc/cmdline ++if grep -qe readonly /proc/cmdline + then + for device in /dev/hd* /dev/sd* /dev/vd* + do diff --git a/debian/patches/series b/debian/patches/series index 8704fa9..4e78816 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,3 +18,4 @@ 35_fix_findiso_umount.patch 36_support_dhcp_bootoption.patch 37_fix_legacy_persistence_handling.patch +38_do_not_check_for_forensic_in_readonly_mode.patch diff --git a/scripts/live-premount/readonly b/scripts/live-premount/readonly index f1bd450..71483bd 100755 --- a/scripts/live-premount/readonly +++ b/scripts/live-premount/readonly @@ -22,7 +22,7 @@ esac # make sure all harddisk devices are read-only # this is important for forensic investigations -if grep -qe readonly /proc/cmdline +if grep -qe forensic -qe readonly /proc/cmdline then for device in /dev/hd* /dev/sd* /dev/vd* do -- 2.1.4