From c0882d44ff052516ccff533e4a418295dd086ef7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 16 Apr 2012 18:30:13 +0000 Subject: [PATCH] - rel 3 - there is no --no-wall option in SysVinit halt command, remove its use Changed files: dracut.spec -> 1.18 reboot-opts.patch -> 1.1 --- dracut.spec | 8 +++++--- reboot-opts.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 reboot-opts.patch diff --git a/dracut.spec b/dracut.spec index 7e2b373..d5a15dd 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,15 +1,16 @@ Summary: Initramfs generator using udev Name: dracut Version: 018 -Release: 2 +Release: 3 License: GPL v2+ Group: Base Source0: ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz # Source0-md5: e65f2a54b6d64619334f501a346f7823 Source1: pld.conf Patch0: no-rh.patch -Patch2: bash-sh.patch -Patch3: plymouth-libexec.patch +Patch1: bash-sh.patch +Patch2: plymouth-libexec.patch +Patch3: reboot-opts.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: dash BuildRequires: docbook-dtd45-xml @@ -128,6 +129,7 @@ configuration. %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/reboot-opts.patch b/reboot-opts.patch new file mode 100644 index 0000000..bf0929c --- /dev/null +++ b/reboot-opts.patch @@ -0,0 +1,13 @@ +--- dracut-018/modules.d/99shutdown/shutdown.sh~ 2012-04-05 13:54:38.000000000 +0200 ++++ dracut-018/modules.d/99shutdown/shutdown.sh 2012-04-16 14:04:49.481733793 +0200 +@@ -98,7 +98,7 @@ + _check_shutdown final + + getarg 'rd.break=shutdown' && emergency_shell -n cmdline "Break before shutdown" +-[ "$1" = "reboot" ] && reboot -f -d -n --no-wall +-[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall +-[ "$1" = "halt" ] && halt -f -d -n --no-wall ++[ "$1" = "reboot" ] && reboot -f -d -n ++[ "$1" = "poweroff" ] && poweroff -f -d -n ++[ "$1" = "halt" ] && halt -f -d -n + [ "$1" = "kexec" ] && kexec -e -- 2.43.0