From 0cebfcf22e09eafca749cca8caa5e963740b3e77 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 16 Feb 2015 21:34:46 +0000
Subject: When updating /etc/shells, only remove existing entries that match
 the new entry exactly. Otherwise we may clobber entries that contain the new
 entry as a substring.

Reviewed by:	bdrewery
Approved by:	bdrewery
Sponsored by:	EMC / Isilon Storage Division
---
 Keywords/shell.ucl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Keywords')

diff --git a/Keywords/shell.ucl b/Keywords/shell.ucl
index 16a094eaca95..7c3ae7f1678a 100644
--- a/Keywords/shell.ucl
+++ b/Keywords/shell.ucl
@@ -18,7 +18,7 @@ post-install: <<EOD
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        (grep -v ${file} /etc/shells.bak; echo ${file}) > /etc/shells
+        (grep -v "^${file}$" /etc/shells.bak; echo ${file}) > /etc/shells
         rm -f /etc/shells.bak
 EOD
 pre-deinstall: <<EOD
@@ -27,6 +27,6 @@ pre-deinstall: <<EOD
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        grep -v ${file} /etc/shells.bak > /etc/shells
+        grep -v "^${file}$" /etc/shells.bak > /etc/shells
         rm -f /etc/shells.bak
 EOD
-- 
cgit v1.2.3