mount: fix extra -t parameter #51905
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
For reference, this bug was introduced here: |
|
Ouch, is already in 2018.X, so needs to be backported there too. |
aplanas
force-pushed
the
fix_mount
branch
2 times, most recently
from
828c01d
to
b30a5d5
Compare
|
Based on IRC comment, and after reading [1] I changed the base branch from develop to 2018.3. I hope that this make the code move to 2019.2 and develop. [1] https://docs.saltstack.com/en/develop/topics/development/contributing.html#which-salt-branch |
dincamihai
reviewed
Mar 1, 2019
|
@aplanas Since this if fixing a bug, can you write a test for it please? |
|
@dwoz makes sense! |
If 'fstype' parameter is not set in Linux environments, salt will build a mount command with an empty -t value, making the command fail.
|
@dwoz I updated the test_mount code. I think that this test needs some refactoring, but I also think that is out of scope of this pull request |
|
@aplanas I agree we should break up that monster test :D. Looks good for this PR though, thanks! |
|
Thanks for the reviews! Do I need to port it to 2019.2 and develop? Or is there any process that will take care of it? |
aplanas
added a commit
to aplanas/salt-1
that referenced
this pull request
Mar 6, 2019
* Add root and no_recommends parameters in the public interface for Zypper and RPM (lowpkg) saltstack/salt#50125 * Add root parameter to useradd, shadow and groupadd saltstack/salt#50175 * cmd: Add root parameter for wait and run states saltstack/salt#50302 * systemd: add optional root parameter saltstack/salt#50380 * Add new chroot module https://github.com/openSUSE/salt/pull/50418 * Add new module freezer saltstack/salt#50452 * btrfs: add all subvolume commands saltstack/salt#50541 * btrfs: add new btrfs state saltstack/salt#50635 * zypper: demote log from error to warning saltstack/salt#50671 * blkid: add search by token saltstack/salt#50706 * mount: add fstab_{present,absent} states saltstack/salt#50725 * btrfs: add option to not set subvolumes as default saltstack/salt#50801 * Add disk_set and disk_toggle functions, and update valid partition flags saltstack/salt#50834 * disk: support setting FAT size for format_ saltstack/salt#51074 * parted: fix set_ valid flags comment. saltstack/salt#51704 * grains/core: ignore HOST_NOT_FOUND errno in fqdns() saltstack/salt#51706 * cmdmod: add 'binds' parameter in run_chroot saltstack/salt#51871 * mount: fix extra -t parameter saltstack/salt#51905 * lvm: be quiet when a pv, lv or vg is not expected saltstack/salt#51929 * linux_lvm: clean error in pvcreate and pvremove saltstack/salt#51954 * blockdev: hide blkid errors when are expected saltstack/salt#51956 * partially unify public functions signature for pkg and lowpkg saltstack/salt#51973 * extmods: add utils directories in sys.path saltstack/salt#52001
aplanas
added a commit
to aplanas/salt-1
that referenced
this pull request
Jun 5, 2019
* Add root and no_recommends parameters in the public interface for Zypper and RPM (lowpkg) saltstack/salt#50125 * Add root parameter to useradd, shadow and groupadd saltstack/salt#50175 * cmd: Add root parameter for wait and run states saltstack/salt#50302 * systemd: add optional root parameter saltstack/salt#50380 * Add new chroot module https://github.com/openSUSE/salt/pull/50418 * Add new module freezer saltstack/salt#50452 * btrfs: add all subvolume commands saltstack/salt#50541 * btrfs: add new btrfs state saltstack/salt#50635 * zypper: demote log from error to warning saltstack/salt#50671 * blkid: add search by token saltstack/salt#50706 * mount: add fstab_{present,absent} states saltstack/salt#50725 * btrfs: add option to not set subvolumes as default saltstack/salt#50801 * Add disk_set and disk_toggle functions, and update valid partition flags saltstack/salt#50834 * disk: support setting FAT size for format_ saltstack/salt#51074 * parted: fix set_ valid flags comment. saltstack/salt#51704 * grains/core: ignore HOST_NOT_FOUND errno in fqdns() saltstack/salt#51706 * cmdmod: add 'binds' parameter in run_chroot saltstack/salt#51871 * mount: fix extra -t parameter saltstack/salt#51905 * lvm: be quiet when a pv, lv or vg is not expected saltstack/salt#51929 * linux_lvm: clean error in pvcreate and pvremove saltstack/salt#51954 * blockdev: hide blkid errors when are expected saltstack/salt#51956 * partially unify public functions signature for pkg and lowpkg saltstack/salt#51973 * extmods: add utils directories in sys.path saltstack/salt#52001
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If 'fstype' parameter is not set in Linux environments, salt will
build a mount command with an empty -t value, making the command
fail.
Note that this code needs to be backported to 2019.2, as this bug is also present there.