diff options
Diffstat (limited to 'dracut')
| -rwxr-xr-x | dracut/anaconda-netroot.sh | 3 | ||||
| -rwxr-xr-x | dracut/parse-anaconda-repo.sh | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh index 3ab873a73..0425661c2 100755 --- a/dracut/anaconda-netroot.sh +++ b/dracut/anaconda-netroot.sh @@ -8,8 +8,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh netif="$1" # get repo info -# splitsep ":" "$root" prefix repo # FIXME: doesn't work as documented! -prefix=${root%%:*}; repo=${root#*:} +splitsep ":" "$root" prefix repo # no repo? non-net root? we're not needed here. [ "$prefix" = "anaconda-net" ] && [ -n "$repo" ] || return 0 diff --git a/dracut/parse-anaconda-repo.sh b/dracut/parse-anaconda-repo.sh index 59bf7b50b..96de45809 100755 --- a/dracut/parse-anaconda-repo.sh +++ b/dracut/parse-anaconda-repo.sh @@ -12,9 +12,7 @@ arg="repo" [ -n "$stage2" ] && arg="stage2" && repo="$stage2" if [ -n "$repo" ]; then - #splitsep ":" "$repo" repotype rest # FIXME: splitsep is buggy - repotype=${repo%%:*} - rest=${repo#$repotype:}; [ "$rest" = "$repo" ] && rest="" + splitsep ":" "$repo" repotype rest case "$repotype" in http|https|ftp|nfs|nfs4|nfsiso) set_neednet; root="anaconda-net:$repo" ;; |