[fedup/f17] fix system-upgrade.target for f17

Will Woods wwoods at fedoraproject.org
Thu May 16 21:07:36 UTC 2013


commit 476a14563ba3ca9717fb018bf419d89ed5eeaf8a
Author: Will Woods <wwoods at redhat.com>
Date:   Thu May 16 17:03:58 2013 -0400

    fix system-upgrade.target for f17

 fedup.spec            |    6 +++++-
 system-upgrade.target |    3 +++
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/fedup.spec b/fedup.spec
index 7f70a28..599bd48 100644
--- a/fedup.spec
+++ b/fedup.spec
@@ -1,6 +1,6 @@
 Name:           fedup
 Version:        0.7.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The Fedora Upgrade tool
 
 License:        GPLv2+
@@ -10,6 +10,7 @@ Source0:        https://github.com/downloads/wgwoods/fedup/%{name}-%{version}.ta
 # Apply this as an update to fix hang with encrypted /home (bug #896023)
 Source1:        bug896023.img
 # Fix upgrade getting stuck for F18->F19 (bug #954371)
+# Also fix emergency shell when doing F17->Fxx (bug #958586)
 Source2:        system-upgrade.target
 
 # Require updates to various packages where necessary to fix bugs.
@@ -79,6 +80,9 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
 #{_datadir}/fedup/ui
 
 %changelog
+* Thu May 16 2013 Will Woods <wwoods at redhat.com> 0.7.3-5
+- Fix emergency shell when upgrading from F17 (#958586)
+
 * Tue Apr 30 2013 Will Woods <wwoods at redhat.com> 0.7.3-4
 - Dependency fix: can't Obsolete preupgrade until F19 :/
 
diff --git a/system-upgrade.target b/system-upgrade.target
index 46b7822..4ad4806 100644
--- a/system-upgrade.target
+++ b/system-upgrade.target
@@ -6,6 +6,9 @@ Documentation=man:systemd.special(7)
 Requires=sysinit.target
 Conflicts=shutdown.target systemd-readahead-collect.service systemd-readahead-replay.service
 After=sysinit.target
+# F17 needs these to start properly
+Wants=udev.service udev-trigger.service
+After=udev.service udev-trigger.service
 Before=shutdown.target
 Wants=upgrade-prep.service
 AllowIsolate=yes


More information about the scm-commits mailing list