Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue when adding fstab entries with iso9660 #10572

Merged
merged 3 commits into from
May 30, 2023
Merged

Fix issue when adding fstab entries with iso9660 #10572

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da07ef7
Fix issue when adding fstab entries with iso9660
Xeicker May 4, 2023
46bf269
Address Gate test issue on empty string
Xeicker May 18, 2023
4a1dc26
Update shared/macros/10-bash.jinja
Xeicker May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions shared/macros/10-bash.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,6 +1586,10 @@ if ! grep "$mount_point_match_regexp" /etc/fstab; then
previous_mount_opts=$(grep "$mount_point_match_regexp" /etc/mtab | head -1 | awk '{print $4}' \
| sed -E "s/(rw|defaults|seclabel|{{{ mount_opt }}})(,|$)//g;s/,$//")
[ "$previous_mount_opts" ] && previous_mount_opts+=","
# In iso9660 filesystems mtab could describe a "blocksize" value, this should be reflected in fstab as "block"
if [ "{{{ type }}}" == "iso9660" ] ; then
Xeicker marked this conversation as resolved.
Show resolved Hide resolved
previous_mount_opts=$(sed 's/blocksize=/block=/' <<< "$previous_mount_opts")
fi
echo "{{{ fs_spec }}} {{{ mount_point }}} {{{ type }}} defaults,${previous_mount_opts}{{{ mount_opt }}} 0 0" >> /etc/fstab
# If the mount_opt option is not already in the mount point's /etc/fstab entry, add it
elif ! grep "$mount_point_match_regexp" /etc/fstab | grep "{{{ mount_opt }}}"; then
Expand Down