From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Dec 2021 20:48:50 +0000 (-0800)
Subject: Remove the collection of GRUB files from the vm-support script
X-Git-Tag: stable-12.0.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a3e4b02c5515cde9f10e351b67dade9c073d6e;p=thirdparty%2Fopen-vm-tools.git

Remove the collection of GRUB files from the vm-support script

GRUB configuration files have not been needed in the past. Therefore, as part
of this change, removing the code from vm-support script which collects any
grub configuration files.
---

diff --git a/open-vm-tools/scripts/common/vm-support b/open-vm-tools/scripts/common/vm-support
index f8e3b29b2..5943e4bf8 100644
--- a/open-vm-tools/scripts/common/vm-support
+++ b/open-vm-tools/scripts/common/vm-support
@@ -133,26 +133,6 @@ addfiles()
 }
 
 
-# addGrubFile(): adds a grub file to the archive after
-# replacing password hash with 'xxxxxx'
-addGrubFile()
-{
-   file="$1"
-
-   addfile "$file"
-   if [ $? != 0 ]; then
-      return
-   fi
-
-   # Avoid tempering with links
-   if [ ! -L "${OUTPUT_DIR}$file" ]; then
-      cat "${OUTPUT_DIR}$file" | \
-         sed 's/password[[:space:]]\+\(.*\)[[:space:]]\+\(.*\)$/password \1 xxxxxx/g' > \
-         "${OUTPUT_DIR}$file.modified"
-      mv "${OUTPUT_DIR}$file.modified" "${OUTPUT_DIR}$file"
-   fi
-}
-
 # runcmd($out, $cmd): executes the command redirected to a file
 runcmd()
 {
@@ -181,12 +161,6 @@ stageLinux()
    # Try to collect bootloader config.
    addfile /etc/lilo.conf
 
-   # And for grub we are not sure about the exact default location so collect them
-   # all.
-   addGrubFile /boot/grub/grub.conf
-   addGrubFile /boot/grub/menu.lst
-   addGrubFile /etc/grub.conf
-
    # Old linux kernel use modules.conf while new kernel use modprobe.conf and modprobe.d
    addfile /etc/modules.conf
    addfile /etc/modprobe.conf
@@ -280,7 +254,7 @@ collectNetworkDetails()
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 TARFILE=vm-`date +%Y-%m-%d`.$$.tar.gz
-VER=0.93
+VER=0.94
 
 # Parse args
 for option in $@