From 05e82b2391aa2bf1ceef6c50f39613612d9179d5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 15 Sep 2008 17:43:44 +0200 Subject: [PATCH] Add debian/patches/04_ignore_errors_from_fstype.dpatch --- debian/changelog | 5 ++++- debian/patches/00list | 1 + debian/patches/04_ignore_errors_from_fstype.dpatch | 24 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 debian/patches/04_ignore_errors_from_fstype.dpatch diff --git a/debian/changelog b/debian/changelog index 07be76e..7a3a962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ live-initramfs (1.139.1-2grml.01) unstable; urgency=low * Resync with Debian's 1.139.1-2 version. + * Add debian/patches/04_ignore_errors_from_fstype.dpatch + to ignore errors from fstype, otherwise we have + "stdin: error 0" during bootup. - -- Michael Prokop Mon, 15 Sep 2008 17:28:20 +0200 + -- Michael Prokop Mon, 15 Sep 2008 17:43:13 +0200 live-initramfs (1.139.1-1grml.01) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index af077af..e0ba1a6 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,5 @@ 01_add_rsync.dpatch 02_more_verbose_toram.dpatch 03_grml_version_file_hook.dpatch +04_ignore_errors_from_fstype.dpatch 05_boot_failure_message_grml.dpatch diff --git a/debian/patches/04_ignore_errors_from_fstype.dpatch b/debian/patches/04_ignore_errors_from_fstype.dpatch new file mode 100644 index 0000000..cf8b789 --- /dev/null +++ b/debian/patches/04_ignore_errors_from_fstype.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_ignore_errors_from_fstype.dpatch by Michael Prokop +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Ignore errors from fstype +## +## Redirect stderr to /dev/null, otherwise we'll get +## "stdin: error 0" for some partitions during bootup. +## + +@DPATCH@ + +diff -r 6b72cefbc61b scripts/live-helpers +--- a/scripts/live-helpers Mon Sep 15 17:32:23 2008 +0200 ++++ b/scripts/live-helpers Mon Sep 15 17:34:17 2008 +0200 +@@ -77,7 +77,7 @@ + return + fi + +- eval $(fstype < ${1}) ++ eval $(fstype < ${1} 2>/dev/null) + + if [ "${FSTYPE}" != "unknown" ] + then -- 2.1.4