From 2e25c4255746b144932f84b7b6671d7d03f52278 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@trick.home.annexia.org>
Date: Sat, 13 Jun 2009 10:48:16 +0100
Subject: [PATCH] Rename (make|update)-initramfs.sh.in -> (make|update).sh.in

---
 .gitignore                                         |  5 ++---
 appliance/Makefile.am                              | 10 +++++-----
 appliance/{make-initramfs.sh.in => make.sh.in}     |  0
 appliance/{update-initramfs.sh.in => update.sh.in} |  0
 configure.ac                                       |  4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename appliance/{make-initramfs.sh.in => make.sh.in} (100%)
 rename appliance/{update-initramfs.sh.in => update.sh.in} (100%)

diff --git a/.gitignore b/.gitignore
index 296db62..b64c377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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 066becb..1886e3e 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
similarity index 100%
rename from appliance/make-initramfs.sh.in
rename to appliance/make.sh.in
diff --git a/appliance/update-initramfs.sh.in b/appliance/update.sh.in
similarity index 100%
rename from appliance/update-initramfs.sh.in
rename to appliance/update.sh.in
diff --git a/configure.ac b/configure.ac
index 3e61398..f1562f4 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
-- 
1.8.3.1