[gnome-ostree] Update dracut patch for latest deployment model
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] Update dracut patch for latest deployment model
- Date: Wed, 26 Dec 2012 23:36:42 +0000 (UTC)
commit 46757138650a573e3c3d83cd306972480870c228
Author: Colin Walters <walters verbum org>
Date: Wed Dec 26 18:36:00 2012 -0500
Update dracut patch for latest deployment model
patches/dracut-Support-OSTree.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/patches/dracut-Support-OSTree.patch b/patches/dracut-Support-OSTree.patch
index 33c49ba..2be0815 100644
--- a/patches/dracut-Support-OSTree.patch
+++ b/patches/dracut-Support-OSTree.patch
@@ -1,6 +1,6 @@
-From cf59b7d7258fcf1cd8270dd257f2c5f04d63be8e Mon Sep 17 00:00:00 2001
+From 38d464be708874ce722d0c2e9808224ad9221030 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
-Date: Mon, 24 Oct 2011 22:01:17 -0400
+Date: Sun, 16 Dec 2012 15:43:29 -0500
Subject: [PATCH] Support OSTree
If the kernel command line includes an "ostree=foo" argument, assume
@@ -19,9 +19,9 @@ This required changing only the rootfs-block module basically.
Conflicts:
modules.d/95rootfs-block/mount-root.sh
---
- modules.d/95rootfs-block/mount-root.sh | 14 +++++++-------
- modules.d/99base/init.sh | 27 ++++++++++++++++++++-------
- modules.d/99base/module-setup.sh | 4 ++++
+ modules.d/95rootfs-block/mount-root.sh | 14 +++++++-------
+ modules.d/99base/init.sh | 27 ++++++++++++++++++++-------
+ modules.d/99base/module-setup.sh | 4 ++++
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
@@ -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..502af09 100755
+index 16c8958..1212b23 100755
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -200,6 +200,14 @@ unset queuetriggered
@@ -77,7 +77,7 @@ index 16c8958..502af09 100755
+ostree=$(getarg ostree=)
+if test -n $ostree; then
+ NEWROOT_MOUNTPOINT=${NEWROOT}
-+ NEWROOT=${NEWROOT}/ostree/$ostree
++ NEWROOT=${NEWROOT}/ostree/deploy/$ostree
+else
+ NEWROOT_MOUNTPOINT=$NEWROOT
+fi
@@ -145,10 +145,10 @@ index 16c8958..502af09 100755
warn "file a bug against dracut."
emergency_shell
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index 2bcb6a1..fec8605 100755
+index a512868..7839081 100755
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
-@@ -40,6 +40,10 @@ install() {
+@@ -41,6 +41,10 @@ install() {
mkdir -p ${initdir}/tmp
dracut_install switch_root || dfatal "Failed to install switch_root"
@@ -160,5 +160,5 @@ index 2bcb6a1..fec8605 100755
inst_simple "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
--
-1.7.11.4
+1.7.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]