From aa7676aa74f3396fc65ae6b4bf01af7efe021e7e Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Sat, 13 Jun 2009 10:59:51 +0100 Subject: [PATCH] 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. --- appliance/make.sh.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 -- 1.8.3.1