Rename tbdiff-update to tb-update.

4 files changed, 5 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index d3fc717..8f68b1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS =								\
 	tbdiff-create							\
 	tbdiff-deploy							\
 	tbdiff-switch							\
-	tbdiff-update							\
+	tb-update							\
 	tests
 
 .PHONY: ChangeLog
diff --git a/configure.ac b/configure.ac
index 6ee08fe..ad86cbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ tbdiff/tbdiff-1.pc
 tbdiff-create/Makefile
 tbdiff-deploy/Makefile
 tbdiff-switch/Makefile
-tbdiff-update/Makefile
+tb-update/Makefile
 tests/Makefile
 ])
 
diff --git a/tbdiff-update/Makefile.am b/tb-update/Makefile.am
index bddbb13..3a2f60b 100644
--- a/tbdiff-update/Makefile.am
+++ b/tb-update/Makefile.am
@@ -17,4 +17,4 @@
 # vi:set ts=8 sw=8 noet ai nocindent:
 
 bin_SCRIPTS =								\
-	tbdiff-update
+	tb-update
diff --git a/tbdiff-update/tbdiff-update b/tb-update/tb-update
index 1014a3c..67a4637 100755
--- a/tbdiff-update/tbdiff-update
+++ b/tb-update/tb-update
@@ -108,7 +108,7 @@ echo "Configuring extlinux to boot from \"$target_subvolume-run\""
 busybox sed -i -e "s,factory-run,$target_subvolume-run,g" "extlinux.conf"
 
 # clear the traps
-trap EXIT SIGINT SIGTERM
+trap - EXIT SIGINT SIGTERM
 
 # leave the root file system
 cd /
@@ -117,7 +117,7 @@ cd /
 umount "$rootfs"
 
 # remove the temporary directory
-rm -rf "$rootfs"
+busybox rm -rf "$rootfs"
 
 # reboot the system
 busybox reboot