From ca16a2d529078f31807c2ef13d153787df62efa4 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 15 Sep 2009 17:05:01 +0000 Subject: [PATCH] Resolves: bz 522486 --- kdump_dracut_modules/99kdumpbase/check | 5 +++++ kdump_dracut_modules/99kdumpbase/install | 2 +- kexec-tools.spec | 8 +++++++- sources | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/kdump_dracut_modules/99kdumpbase/check b/kdump_dracut_modules/99kdumpbase/check index a194ad0..a9de7dd 100755 --- a/kdump_dracut_modules/99kdumpbase/check +++ b/kdump_dracut_modules/99kdumpbase/check @@ -1,4 +1,9 @@ #!/bin/sh +if [ ! -f /etc/kdump-adv-conf/init ] +then + # exit if we didn't set up an init script + exit 1 +fi #do not add this module by default exit 1 diff --git a/kdump_dracut_modules/99kdumpbase/install b/kdump_dracut_modules/99kdumpbase/install index f1e3e63..8f38a67 100755 --- a/kdump_dracut_modules/99kdumpbase/install +++ b/kdump_dracut_modules/99kdumpbase/install @@ -2,4 +2,4 @@ rm -f $initdir/init inst "/etc/kdump-adv-conf/init" "/init" inst "/bin/date" "/bin/date" -inst "/usr/bin/reboot" "bin/reboot" +inst "/usr/bin/reboot" "/bin/reboot" diff --git a/kexec-tools.spec b/kexec-tools.spec index 8bc5b58..2b94ae5 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.0 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component. @@ -150,6 +150,9 @@ make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT # untar the dracut package mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100} +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/check +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/install + #and move the custom dracut modules to the dracut directory mkdir -p $RPM_BUILD_ROOT/usr/share/dracut/modules.d/ @@ -261,6 +264,9 @@ done %changelog +* Tue Sep 15 2009 Neil Horman - 2.0.0-27 +- Fixing permissions on dracut module files + * Fri Sep 11 2009 Neil Horman - 2.0.0-26 - Rebuild for translation team (bz 522415) diff --git a/sources b/sources index ee4afaf..e3fe2a9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ d9f2ecd3c3307905f24130a25816e6cc kexec-tools-2.0.0.tar.bz2 3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz 190f8878aa7e7b63a96fde5d59538eec makedumpfile-1.3.3.tar.gz -1c240b7c727d44c5a3e1ef2d59a4f80d dracut-files.tbz2 +9a5f7a5781bd9c357badb0ade0896842 dracut-files.tbz2