diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-06-13 10:59:51 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-06-13 10:59:51 +0100 |
| commit | aa7676aa74f3396fc65ae6b4bf01af7efe021e7e (patch) | |
| tree | 73eaa7dfdfa68e04561a8b3264d25ce0c9f665cd | |
| parent | 2e25c4255746b144932f84b7b6671d7d03f52278 (diff) | |
| download | libguestfs-aa7676aa74f3396fc65ae6b4bf01af7efe021e7e.tar.gz libguestfs-aa7676aa74f3396fc65ae6b4bf01af7efe021e7e.tar.xz libguestfs-aa7676aa74f3396fc65ae6b4bf01af7efe021e7e.zip | |
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.
| -rwxr-xr-x | appliance/make.sh.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/appliance/make.sh.in b/appliance/make.sh.in index b39b13d6..cab88133 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 |