[ostree] gnomeos: Kill Yocto init scripts, switch to my ginitscripts



commit 339271726a25b69f39a6871cf163df95e9380ac4
Author: Colin Walters <walters verbum org>
Date:   Sun Feb 19 20:51:42 2012 -0500

    gnomeos: Kill Yocto init scripts, switch to my ginitscripts
    
    There's reams of crud in the Yocto ones, and we need a place
    to put our custom scripts.

 gnomeos/3.4/manifest.json                          |    2 +
 gnomeos/yocto/classes/gnomeos-contents.bbclass     |   10 +-
 .../initscripts/initscripts-1.0/GPLv2.patch        |  347 --------------------
 .../initscripts/initscripts-1.0/NetworkManager     |   31 --
 .../initscripts/initscripts-1.0/banner.sh          |   24 --
 .../recipies-core/initscripts/initscripts-1.0/dbus |   32 --
 .../initscripts/initscripts-1.0/device_table.txt   |  197 -----------
 .../initscripts/initscripts-1.0/finish.sh          |   14 -
 .../initscripts/initscripts-1.0/functions          |   44 ---
 .../initscripts/initscripts-1.0/gnomeinit          |   43 ---
 .../initscripts/initscripts-1.0/gnomemisc          |    3 -
 .../recipies-core/initscripts/initscripts-1.0/halt |   29 --
 .../initscripts/initscripts-1.0/hostname.sh        |   13 -
 .../initscripts/initscripts-1.0/mountall.sh        |   38 ---
 .../initscripts/initscripts-1.0/mountnfs.sh        |   83 -----
 .../initscripts/initscripts-1.0/reboot             |   15 -
 .../initscripts/initscripts-1.0/rmnologin.sh       |   20 --
 .../initscripts/initscripts-1.0/save-rtc.sh        |   13 -
 .../initscripts/initscripts-1.0/sendsigs           |   21 --
 .../initscripts/initscripts-1.0/single             |   24 --
 .../initscripts/initscripts-1.0/umountfs           |   24 --
 .../initscripts/initscripts-1.0/umountnfs.sh       |   32 --
 .../initscripts/initscripts-1.0/urandom            |   46 ---
 .../recipies-core/initscripts/initscripts_1.0.bb   |  109 ------
 24 files changed, 5 insertions(+), 1209 deletions(-)
---
diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 2550f85..ca759ac 100644
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -24,6 +24,8 @@
 		"cgwalters": "git:git://github.com/cgwalters/"},
 
   "components": [
+   		{"src": "cgwalters:ginitscripts"},
+
    		{"src": "gnome:gtk-doc-stub",
 		 "component": "devel"},
 
diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index d84d089..58fbd87 100644
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -99,12 +99,9 @@ fakeroot do_rootfs () {
 
 	rootfs_${IMAGE_PKGTYPE}_do_rootfs
 
-	# We use devtmpfs
-	rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache
-	rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache*
-
-	rm -f ${IMAGE_ROOTFS}/etc/rcS.d/S03udev
-	rm -f ${IMAGE_ROOTFS}/etc/rcS.d/*networking
+	# Delete all of the init scripts; we have our own
+	rm -f ${IMAGE_ROOTFS}/etc/init.d/*
+	rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*
 
 	# Clear out the default fstab; everything we need right now is mounted
 	# in the initramfs.
@@ -112,7 +109,6 @@ fakeroot do_rootfs () {
 
 	# Kill the Debian netbase stuff - we use NetworkManager
 	rm -rf ${IMAGE_ROOTFS}/etc/network
-	rm -f ${IMAGE_ROOTFS}/etc/init.d/networking
 
 	# We deploy kernels via an external mechanism; the modules
 	# directory is just a bind mount to /sysroot.



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]