Skip to content

Commit

Permalink
have pushd and popd output on stderr so that it is only in the log (i…
Browse files Browse the repository at this point in the history
…ssue1085)
  • Loading branch information
jsmeix committed Feb 24, 2017
1 parent 4af8e90 commit 8cbf0e6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions usr/share/rear/restore/ZYPPER/default/940_generate_fstab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set -e -u -o pipefail
# Determine system partition and swap partition
# from what is in LAYOUT_FILE (usually var/lib/rear/layout/disklayout.conf).
local keyword device_node mountpoint filesystem_type junk
pushd /dev/disk/by-uuid/
pushd /dev/disk/by-uuid/ 1>&2
# Ensure file name generation (globbing) is enabled (needed below in 'for uuid in *'):
set +f
# Write swap entries to etc/fstab in the target system:
Expand Down Expand Up @@ -62,7 +62,7 @@ while read keyword device_node mountpoint filesystem_type junk ; do
LogPrint "Wrote '$device_node $mountpoint $filesystem_type defaults 0 0' to etc/fstab in the target system"
fi
done < <( grep "^fs " "$LAYOUT_FILE" )
popd
popd 1>&2

# Restore the ReaR default bash flags and options (see usr/sbin/rear):
apply_bash_flags_and_options_commands "$DEFAULT_BASH_FLAGS_AND_OPTIONS_COMMANDS"
Expand Down

0 comments on commit 8cbf0e6

Please sign in to comment.