[ostree] gnomeos: Drop ostree-init module
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] gnomeos: Drop ostree-init module
- Date: Mon, 20 Feb 2012 19:02:06 +0000 (UTC)
commit 00ad0a2ea7965de5852e35395fcfd9c9df4ebc2a
Author: Colin Walters <walters verbum org>
Date: Mon Feb 20 14:00:56 2012 -0500
gnomeos: Drop ostree-init module
We use dracut+ostree-switch-root now
gnomeos/3.4/manifest.json | 2 --
gnomeos/yocto/15_ostree | 2 +-
gnomeos/yocto/gnomeos-install.sh | 1 -
3 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index ca759ac..3c42650 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -49,8 +49,6 @@
{"src": "gnome:linux-user-chroot"},
- {"src": "gnome:ostree-init"},
-
{"src": "gnome:ostree",
"config-opts": ["--disable-documentation"]},
diff --git a/gnomeos/yocto/15_ostree b/gnomeos/yocto/15_ostree
index d67cf44..554e0bc 100755
--- a/gnomeos/yocto/15_ostree
+++ b/gnomeos/yocto/15_ostree
@@ -28,7 +28,7 @@ EOF
cat <<EOF
echo '"Loading ${os} ${version}"'
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro init=/ostree/ostree-init ${args}
+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ostree=current ${args}
EOF
if test -n "${initrd}" ; then
message="$(gettext_printf "Loading initial ramdisk ...")"
diff --git a/gnomeos/yocto/gnomeos-install.sh b/gnomeos/yocto/gnomeos-install.sh
index 85de0d6..08832cb 100755
--- a/gnomeos/yocto/gnomeos-install.sh
+++ b/gnomeos/yocto/gnomeos-install.sh
@@ -70,7 +70,6 @@ done
rm -f current
ln -s ${BRANCH_PREFIX}runtime-current current
-cp -a ./${BRANCH_PREFIX}${branch}-current/usr/sbin/ostree-init .
cd -
if test -d /etc/grub.d; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]