diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-06-13 10:48:16 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-06-13 10:48:16 +0100 |
| commit | 2e25c4255746b144932f84b7b6671d7d03f52278 (patch) | |
| tree | 52a0a07df144cd6792e65c24ee27a441c02499b9 | |
| parent | bf4eda4d89468b232070dbe0161848acaac1c04a (diff) | |
| download | libguestfs-2e25c4255746b144932f84b7b6671d7d03f52278.tar.gz libguestfs-2e25c4255746b144932f84b7b6671d7d03f52278.tar.xz libguestfs-2e25c4255746b144932f84b7b6671d7d03f52278.zip | |
Rename (make|update)-initramfs.sh.in -> (make|update).sh.in
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | appliance/Makefile.am | 10 | ||||
| -rwxr-xr-x | appliance/make.sh.in (renamed from appliance/make-initramfs.sh.in) | 0 | ||||
| -rwxr-xr-x | appliance/update.sh.in (renamed from appliance/update-initramfs.sh.in) | 0 | ||||
| -rw-r--r-- | configure.ac | 4 |
5 files changed, 9 insertions, 10 deletions
@@ -21,9 +21,8 @@ Makefile.in Makefile aclocal.m4 appliance/initramfs.*.img -appliance/make-initramfs.sh -appliance/make-initramfs.sh.in.old -appliance/update-initramfs.sh +appliance/make.sh +appliance/update.sh appliance/vmlinuz.* autom4te.cache capitests/test-command diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 066becbb..1886e3e1 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. EXTRA_DIST = \ - make-initramfs.sh update-initramfs.sh + make.sh update.sh # Build the root filesystem (appliance). # Currently this is arch-dependent, so it seems like putting it in @@ -32,17 +32,17 @@ fs_DATA = $(INITRAMFSIMG) $(VMLINUZ) $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log -$(top_builddir)/initramfs/fakeroot.log: make-initramfs.sh.in +$(top_builddir)/initramfs/fakeroot.log: make.sh -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak -mv $(VMLINUZ) $(VMLINUZ).bak - if ! bash make-initramfs.sh; then rm -f $@; exit 1; fi + if ! bash make.sh; then rm -f $@; exit 1; fi $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd rm -f $@ - bash update-initramfs.sh + bash update.sh touch $@ -make-initramfs.sh: make-initramfs.sh.in +make.sh: make.sh.in cd .. && ./config.status appliance/$@ # Test-boot the image. diff --git a/appliance/make-initramfs.sh.in b/appliance/make.sh.in index b39b13d6..b39b13d6 100755 --- a/appliance/make-initramfs.sh.in +++ b/appliance/make.sh.in diff --git a/appliance/update-initramfs.sh.in b/appliance/update.sh.in index 3b779f85..3b779f85 100755 --- a/appliance/update-initramfs.sh.in +++ b/appliance/update.sh.in diff --git a/configure.ac b/configure.ac index 3e613989..f1562f49 100644 --- a/configure.ac +++ b/configure.ac @@ -452,7 +452,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile po/Makefile.in examples/Makefile appliance/Makefile - appliance/make-initramfs.sh appliance/update-initramfs.sh + appliance/make.sh appliance/update.sh images/Makefile capitests/Makefile regressions/Makefile @@ -468,7 +468,7 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT dnl WTF? -chmod +x appliance/make-initramfs.sh appliance/update-initramfs.sh +chmod +x appliance/make.sh appliance/update.sh dnl Produce summary. echo |