From: Ulrich Dangel <uli@spamt.net>
Date: Wed, 28 Oct 2009 23:22:20 +0000 (+0100)
Subject: Use rm -f instead of rm.
X-Git-Tag: v0.99.9~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=e9048c60067568cd587678243c7ae568c7934d84

Use rm -f instead of rm.
---

diff --git a/debian/changelog b/debian/changelog
index 7950d3b..62c8168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-terminalserver (0.99.9) UNRELEASED; urgency=low
+
+  * Make templates/grub-pxelinux_config more robust and use rm -f instead of rm.
+
+ -- Ulrich Dangel <mru@grml.org>  Thu, 29 Oct 2009 00:20:41 +0100
+
 grml-terminalserver (0.99.8) unstable; urgency=low
 
   * Adjust bsd arguments for network boot.
diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 8870d45..a538792 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -118,7 +118,7 @@ fi
 sed -i -e 's#\(.*kernel .*/ldbsd.com\)#\1 set image /boot/addons/bsd4grml/bsd.rd`echo Type "boot" to load MirOS bsd4grml via keeppxe#' "$TFTPD_DATA_DIR_/"addon_*_bsd.cfg
 
 # remove grub entries
-rm "$TFTPD_DATA_DIR_/"addon_*grub*.cfg
+rm -f "$TFTPD_DATA_DIR_/"addon_*grub*.cfg
 
 mv "$TFTPD_DATA_DIR_/syslinux.cfg" "$TFTPD_DATA_DIR_/pxelinux.cfg/default"
 rm -rf "$DEST_DIR"