wwoods pushed to fedup-dracut (master). "fedup-dracut 0.9.2 is here!!! \o/ (..more)"

Mon May 18 21:32:29 UTC 2015

From 2f68dacb0ae474e6bb5a5a6c467374a1215873be Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods at redhat.com>
Date: Mon, 18 May 2015 17:31:21 -0400
Subject: fedup-dracut 0.9.2 is here!!! \o/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

more like ¯\_(ツ)_/¯ tbh

diff --git a/.gitignore b/.gitignore
index e857351..9d399d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /fedup-dracut-0.7.3.tar.xz
 /fedup-dracut-0.8.0.tar.xz
 /fedup-dracut-0.9.0.tar.xz
+/fedup-dracut-0.9.2.tar.xz
diff --git a/0001-Don-t-write-the-entire-system-journal-to-upgrade.log.patch b/0001-Don-t-write-the-entire-system-journal-to-upgrade.log.patch
deleted file mode 100644
index bcb1667..0000000
--- a/0001-Don-t-write-the-entire-system-journal-to-upgrade.log.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From cde5f2d8b71460bb74ac59f38e4f223ab9c67f59 Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods at redhat.com>
-Date: Mon, 10 Nov 2014 12:06:06 -0500
-Subject: [PATCH 1/4] Don't write the entire system journal to upgrade.log
-
-Prior to fedup 0.9.x, the upgrade process kept its journal in-memory
-only, with a different machine-id, so if we wanted a text version of the
-upgrade log you could just dump the entire journal to a file.
-
-With fedup 0.9.x the upgrade logs go to your system's on-disk journal,
-which means dumping the entire journal dumps your entire system log for
-as far back as that goes. Whoops.
-
-This just adds '-b' to the journalctl call so we only get logs for the
-current boot.
-
-(Bonus cleanup: make certain that our shell does the right thing with
-the backup logfile name by doing "${logfile}.old")
-
-Resolves: rhbz#1161366
----
- 85system-upgrade-fedora/save-journal.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/85system-upgrade-fedora/save-journal.sh b/85system-upgrade-fedora/save-journal.sh
-index 7c61e69..89eab1f 100644
---- a/85system-upgrade-fedora/save-journal.sh
-+++ b/85system-upgrade-fedora/save-journal.sh
-@@ -6,7 +6,7 @@ echo "writing logs to disk and rebooting"
- logfile=/sysroot/var/log/upgrade.log
- 
- # back up old logfile, if present
--[ -e $logfile ] && rm -rf $logfile.old && mv $logfile $logfile.old
-+[ -e $logfile ] && rm -rf ${logfile}.old && mv $logfile ${logfile}.old
- 
--# write out the logfile
--journalctl -a -m > $logfile
-+# write out the logfile. bam!
-+journalctl -b -a -m > $logfile
--- 
-2.1.0
-
diff --git a/0003-save-journal.sh-add-boot-ID-to-log-remove-m.patch b/0003-save-journal.sh-add-boot-ID-to-log-remove-m.patch
deleted file mode 100644
index dcbb1eb..0000000
--- a/0003-save-journal.sh-add-boot-ID-to-log-remove-m.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 660157b2d08a5c9d95b8ea1e6eaddb2603ef0983 Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods at redhat.com>
-Date: Wed, 10 Dec 2014 17:42:34 -0500
-Subject: [PATCH 3/4] save-journal.sh: add boot ID to log, remove -m
-
-Saving the boot ID gives you a way to pull the upgrade log data directly
-from the journal, if you want to search / filter / get more data / etc.
-
-Also, remove the '-m' from the journalctl invocation, since we don't
-really want to pull remote data here.
----
- 85system-upgrade-fedora/save-journal.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/85system-upgrade-fedora/save-journal.sh b/85system-upgrade-fedora/save-journal.sh
-index 89eab1f..15f4bc3 100644
---- a/85system-upgrade-fedora/save-journal.sh
-+++ b/85system-upgrade-fedora/save-journal.sh
-@@ -8,5 +8,7 @@ logfile=/sysroot/var/log/upgrade.log
- # back up old logfile, if present
- [ -e $logfile ] && rm -rf ${logfile}.old && mv $logfile ${logfile}.old
- 
--# write out the logfile. bam!
--journalctl -b -a -m > $logfile
-+# write out the logfile
-+bootid=$(</proc/sys/kernel/random/boot_id); bootid=${bootid//-/}
-+echo "-- Boot ID: $bootid --" > $logfile
-+journalctl -b -a >> $logfile
--- 
-2.1.0
-
diff --git a/0004-Disable-consoleblank-during-upgrade.patch b/0004-Disable-consoleblank-during-upgrade.patch
deleted file mode 100644
index f9c7d4a..0000000
--- a/0004-Disable-consoleblank-during-upgrade.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d21dd8a3f1f5fb7d0d732eec1b448b3780dcac39 Mon Sep 17 00:00:00 2001
-From: Will Woods <wwoods at redhat.com>
-Date: Thu, 18 Dec 2014 15:29:40 -0500
-Subject: [PATCH 4/4] Disable consoleblank during upgrade
-
-Blanking the console causes some weird corruption - probably due to some
-crufty VT-layer nonsense that nobody wants to touch - so let's.. not.
-Besides, we should keep the progress visible so people don't freak out
-and think it's crashed.
-
-Resolves: rhbz#1173135
----
- 90system-upgrade/upgrade.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/90system-upgrade/upgrade.sh b/90system-upgrade/upgrade.sh
-index 159b20c..79aad93 100755
---- a/90system-upgrade/upgrade.sh
-+++ b/90system-upgrade/upgrade.sh
-@@ -14,6 +14,9 @@ source_conf /etc/conf.d
- getarg 'rd.upgrade.break=upgrade' 'rd.break=upgrade' && \
-     emergency_shell -n upgrade "Break before upgrade"
- 
-+# equivalent to "setterm -blank 0"
-+[ -c /dev/tty1 ] && echo -ne '\033[9;0]' > /dev/tty1
-+
- setstate() {
-     export UPGRADE_STATE="$*"
-     echo "$UPGRADE_STATE" > $NEWROOT/var/tmp/system-upgrade.state
--- 
-2.1.0
-
diff --git a/fedup-dracut.spec b/fedup-dracut.spec
index ed9f01a..05a9d04 100644
--- a/fedup-dracut.spec
+++ b/fedup-dracut.spec
@@ -2,16 +2,13 @@
 %global plymouthver 0.8.6
 
 Name:       fedup-dracut
-Version:    0.9.0
-Release:    2%{?dist}
+Version:    0.9.2
+Release:    1%{?dist}
 Summary:    The Fedora Upgrade tool initramfs environment
 
 License:    GPLv2+
 URL:        https://github.com/wgwoods/fedup-dracut
 Source0:    https://github.com/downloads/wgwoods/fedup-dracut/%{name}-%{version}.tar.xz
-Patch1:     0001-Don-t-write-the-entire-system-journal-to-upgrade.log.patch
-Patch2:     0003-save-journal.sh-add-boot-ID-to-log-remove-m.patch
-Patch3:     0004-Disable-consoleblank-during-upgrade.patch
 
 Summary:        initramfs environment for system upgrades
 BuildRequires:  rpm-devel >= 4.10.0
@@ -61,6 +58,9 @@ make install DESTDIR=$RPM_BUILD_ROOT \
 
 
 %changelog
+* Mon May 18 2015 Will Woods <wwoods at redhat.com> 0.9.2-1
+- Fix reboot at end of upgrade (#1209941)
+
 * Tue Feb 03 2015 Will Woods <wwoods at redhat.com> 0.9.0-2
 - Don't write the entire system journal to upgrade.log (#1161366)
 - Try to disable console blanking during upgrade (#1173135)
diff --git a/sources b/sources
index 84706ea..d03603f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-778aaa87ae9cf178605e51055f4612b5  fedup-dracut-0.9.0.tar.xz
+f65e2d6f93b8f3d21ae39c85ca008ce1  fedup-dracut-0.9.2.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/fedup-dracut.git/commit/?h=master&id=2f68dacb0ae474e6bb5a5a6c467374a1215873be
