diff --git a/.distro/backport_fix.sh b/.distro/backport_fix.sh index 4a2aeccb..97c5084c 100755 --- a/.distro/backport_fix.sh +++ b/.distro/backport_fix.sh @@ -1,4 +1,4 @@ -#!/usr/bin/zsh +#!/usr/bin/env zsh # # .distro/backport_fix.sh [options] DISTRO_VERSION JIRA_ISSUE DRACUT_PR [COMMIT_COUNT [COMMITS_ORIGIN_REPO]] # @@ -184,7 +184,7 @@ echo "${cis}" \ [[ -z $mod ]] || { - mod="$(echo "$mod" | tr -s ' ' | cut -d' ' -f3)" + mod=$(echo -e "$mod" | tr -s ' ' | cut -d' ' -f3) ls -d $mod diff --git a/modules.d/90multipath/multipathd-configure.service b/modules.d/90multipath/multipathd-configure.service index de690615..6dedd9b9 100644 --- a/modules.d/90multipath/multipathd-configure.service +++ b/modules.d/90multipath/multipathd-configure.service @@ -13,7 +13,7 @@ ConditionPathExists=!/etc/multipath.conf [Service] Type=oneshot ExecStartPre=-/usr/bin/mkdir -p /etc/multipath/multipath.conf.d -ExecStart=/usr/sbin/mpathconf --enable +ExecStart=/usr/sbin/mpathconf --enable --user_friendly_names n [Install] WantedBy=sysinit.target diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh index 62649003..6b6b2666 100755 --- a/modules.d/90multipath/multipathd.sh +++ b/modules.d/90multipath/multipathd.sh @@ -2,7 +2,8 @@ if [ "$(getarg rd.multipath)" = "default" ] && [ ! -e /etc/multipath.conf ]; then mkdir -p /etc/multipath/multipath.conf.d - mpathconf --enable + mpathconf --enable --user_friendly_names n + fi if getargbool 1 rd.multipath && [ -e /etc/multipath.conf ]; then