Fixup mistake in previous
Resolves: RHEL-24847
This commit is contained in:
parent
89149e5f46
commit
ca1561bc94
@ -1,30 +1,19 @@
|
||||
diff --git a/usr/sbin/rear b/usr/sbin/rear
|
||||
index d2cb6c070..3766e6b7d 100755
|
||||
index d2cb6c070..ea66f0a98 100755
|
||||
--- a/usr/sbin/rear
|
||||
+++ b/usr/sbin/rear
|
||||
@@ -117,6 +117,11 @@ SIMULATE=""
|
||||
VERBOSE=""
|
||||
WORKFLOW=""
|
||||
|
||||
+# Used to determine whether TMPDIR has been changed in user config
|
||||
+# Can legitimately change in internal defaults, so we will set it
|
||||
+# after reading them.
|
||||
+saved_tmpdir
|
||||
+
|
||||
# Parse options
|
||||
help_note_text="Use '$PROGRAM --help' or 'man $PROGRAM' for more information."
|
||||
if ! OPTS="$( getopt -n $PROGRAM -o "c:C:dDhsSvVr:" -l "help,version,debugscripts:" -- "$@" )" ; then
|
||||
@@ -376,6 +381,9 @@ fi
|
||||
@@ -376,6 +376,10 @@ fi
|
||||
# and fd6 to get input from the user regardless where to STDIN is redirected:
|
||||
source $SHARE_DIR/lib/_input-output-functions.sh
|
||||
|
||||
+# Used to determine whether TMPDIR has been changed in user config.
|
||||
+# Save the current value to detect changes.
|
||||
+saved_tmpdir="${TMPDIR-}"
|
||||
+
|
||||
# Keep old log file:
|
||||
test -r "$RUNTIME_LOGFILE" && mv -f "$RUNTIME_LOGFILE" "$RUNTIME_LOGFILE".old 2>/dev/null
|
||||
|
||||
@@ -446,6 +454,14 @@ for config in site local rescue ; do
|
||||
@@ -446,6 +450,14 @@ for config in site local rescue ; do
|
||||
test "$( tr -d -c '\r' < $CONFIG_DIR/$config.conf )" && Error "Carriage return character in $CONFIG_DIR/$config.conf (perhaps DOS or Mac format)"
|
||||
Source "$CONFIG_DIR/$config.conf" || true
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user