[gnome-ostree] manifest: Rebase dracut patches, tag it for now
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] manifest: Rebase dracut patches, tag it for now
- Date: Wed, 23 Jan 2013 15:39:33 +0000 (UTC)
commit 3a4b7f0f5a699fe5b13ad36b6c46e7dd3420eb7d
Author: Colin Walters <walters verbum org>
Date: Wed Jan 23 10:39:20 2013 -0500
manifest: Rebase dracut patches, tag it for now
manifest.json | 1 +
patches/dracut-Support-OSTree.patch | 16 ++++++++--------
patches/dracut-systemd-configure.patch | 8 ++++----
3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8d9f7a5..485b852 100644
--- a/manifest.json
+++ b/manifest.json
@@ -774,6 +774,7 @@
{"src": "git:git://git.kernel.org/pub/scm/boot/dracut/dracut.git",
"config-opts": ["--disable-documentation",
"--enable-systemd"],
+ "tag": "ae4758ce0d0ceeddabe4a78dd575c7b42c349a88",
"patches": ["dracut-Support-OSTree.patch",
"dracut-systemd-configure.patch"]},
diff --git a/patches/dracut-Support-OSTree.patch b/patches/dracut-Support-OSTree.patch
index 2be0815..4edbf6c 100644
--- a/patches/dracut-Support-OSTree.patch
+++ b/patches/dracut-Support-OSTree.patch
@@ -1,7 +1,7 @@
-From 38d464be708874ce722d0c2e9808224ad9221030 Mon Sep 17 00:00:00 2001
+From 013ed2a60e81054755717367c489270e6c673fe4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
-Date: Sun, 16 Dec 2012 15:43:29 -0500
-Subject: [PATCH] Support OSTree
+Date: Wed, 23 Jan 2013 10:36:26 -0500
+Subject: [PATCH 1/2] Support OSTree
If the kernel command line includes an "ostree=foo" argument, assume
we're booting using OSTree.
@@ -25,12 +25,12 @@ Conflicts:
3 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
-index 0467a55..0ab084a 100755
+index c7626c3..c4e4c3b 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
-@@ -27,8 +27,8 @@ mount_root() {
-
+@@ -28,8 +28,8 @@ mount_root() {
_rflags_ro="$rflags,ro"
+ _rflags_ro="${_rflags_ro##,}"
- while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
- warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
@@ -39,7 +39,7 @@ index 0467a55..0ab084a 100755
fsck_ask_err
done
-@@ -111,21 +111,21 @@ mount_root() {
+@@ -112,21 +112,21 @@ mount_root() {
[ "$rootfsck" != "0" -a -z "$fastboot" -a "$READONLY" != "yes" ] && \
! strstr "${rflags}" _netdev && \
! getargbool 0 rd.skipfsck; then
@@ -67,7 +67,7 @@ index 0467a55..0ab084a 100755
if ! getargbool 0 rd.skipfsck; then
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 16c8958..1212b23 100755
+index 0259053..6dbc643 100755
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -200,6 +200,14 @@ unset queuetriggered
diff --git a/patches/dracut-systemd-configure.patch b/patches/dracut-systemd-configure.patch
index 7ed2034..efdc9ef 100644
--- a/patches/dracut-systemd-configure.patch
+++ b/patches/dracut-systemd-configure.patch
@@ -1,7 +1,7 @@
-From 1a3d4dfdbeee7953bcf6e84b3e7d941e6fa7ca09 Mon Sep 17 00:00:00 2001
+From 1b5e1ad838fd233d57070666f874cb4877f3ba9d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
-Date: Sun, 30 Dec 2012 03:35:28 -0500
-Subject: [PATCH] build: Add --enable-systemd configure option
+Date: Wed, 16 Jan 2013 18:31:39 -0500
+Subject: [PATCH 2/2] build: Add --enable-systemd configure option
For users of the configure interface, this is a nicer than
systemdsystemunitdir acting as a magical flag. When given, we use
@@ -12,7 +12,7 @@ pkg-config internally to find the unit dir.
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
-index 2888434..40b9e25 100644
+index 234176f..85ff92c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,10 @@ pkglibdir ?= ${libdir}/dracut
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]