summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-27 14:04:44 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-27 14:08:32 +0000
commitfc8198fff8b634172b48c7dab087da4eb3a5e754 (patch)
tree2729f9b2f2e677c7a5e7f499d3e3b4b1cb601c08
parent54d222fc53cdc96fec8ac156e9d3e41d520e0bcd (diff)
downloadtbdiff-fc8198fff8b634172b48c7dab087da4eb3a5e754.tar.gz
Rename tbdiff-switch to tb-switch.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--tb-switch/Makefile.am (renamed from tbdiff-switch/Makefile.am)2
-rwxr-xr-xtb-switch/tb-switch (renamed from tbdiff-switch/tbdiff-switch)4
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 8f68b1f..8c301ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ SUBDIRS = \
tbdiff \
tbdiff-create \
tbdiff-deploy \
- tbdiff-switch \
+ tb-switch \
tb-update \
tests
diff --git a/configure.ac b/configure.ac
index ad86cbf..e0ba901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ tbdiff/Makefile
tbdiff/tbdiff-1.pc
tbdiff-create/Makefile
tbdiff-deploy/Makefile
-tbdiff-switch/Makefile
+tb-switch/Makefile
tb-update/Makefile
tests/Makefile
])
diff --git a/tbdiff-switch/Makefile.am b/tb-switch/Makefile.am
index 596172e..e094e78 100644
--- a/tbdiff-switch/Makefile.am
+++ b/tb-switch/Makefile.am
@@ -17,4 +17,4 @@
# vi:set ts=8 sw=8 noet ai nocindent:
bin_SCRIPTS = \
- tbdiff-switch
+ tb-switch
diff --git a/tbdiff-switch/tbdiff-switch b/tb-switch/tb-switch
index b076354..79568d5 100755
--- a/tbdiff-switch/tbdiff-switch
+++ b/tb-switch/tb-switch
@@ -68,7 +68,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 /
@@ -77,7 +77,7 @@ cd /
umount "$rootfs"
# remove the temporary directory
-rm -rf "$rootfs"
+busybox rm -rf "$rootfs"
# reboot the system
busybox reboot