Merge tag '5.9.3' into release

faiproject · Jun 26, 2020 · 46fa2ab · 46fa2ab
2 parents a12ab21 + 67f4cfa
commit 46fa2ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,16 @@
+fai (5.9.3) unstable; urgency=medium
+
+  [ Thomas Lange ]
+  * updatebase.UBUNTU,UBUNTU/90-apt: use hook for setting locale instead
+    of debconf preseeding
+  * FAIBASE/10-misc: only add /tmp entry to fstab if not in disk_config,
+    first restore hosts.orig, then append my own IP
+
+  [ Andrew Bezella ]
+  * fai-divert: use which instead of command -v
+
+ -- Thomas Lange <lange@debian.org>  Fri, 20 Mar 2020 15:40:53 +0100
+
 fai (5.9.2) unstable; urgency=low
 
   [ Thomas Lange ]

diff --git a/examples/simple b/examples/simple
diff --git a/lib/fai-divert b/lib/fai-divert
@@ -92,7 +92,7 @@ exit 0
 [ "$1" ] || usage
 
 # do not execute if command is not available
-if ! $ROOTCMD command -v dpkg-divert >/dev/null 2>&1 ; then
+if ! $ROOTCMD which dpkg-divert >/dev/null 2>&1 ; then
     exit 0
 fi