From: Richard Jones <rjones@trick.home.annexia.org>
Date: Sat, 13 Jun 2009 09:59:51 +0000 (+0100)
Subject: make.sh calls update.sh directly.
X-Git-Tag: 1.0.46~10
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=aa7676aa74f3396fc65ae6b4bf01af7efe021e7e;p=libguestfs.git

make.sh calls update.sh directly.

Combine the common tail of make.sh and update.sh so that make
just calls update at the end directly.  The effect is the same.
---

diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index b39b13d..cab8813 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -169,11 +169,8 @@ rm init.new
 # be our script, not the real init.
 #@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init
 
-# Copy the daemon into the filesystem.
-@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root
-
-# Generate final image.
-@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t
-mv $output-t $output
-ls -lh $output
 ls -lh $koutput
+
+# Now directly run the update script to copy/update the daemon in the
+# initramfs.
+cd appliance && bash update.sh