diff options
| author | Will Woods <wwoods@redhat.com> | 2012-08-21 13:26:58 -0400 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2012-08-22 14:11:25 -0400 |
| commit | 6bf03608b80890a0c0d376275b1868d1cf03ecf4 (patch) | |
| tree | 4422b5b97f8ad5e7c524f063531602d8333aceb5 /dracut | |
| parent | e7e739179a76c6d83c9ef70f43f9951d3619d7f8 (diff) | |
| download | anaconda-6bf03608b80890a0c0d376275b1868d1cf03ecf4.tar.gz anaconda-6bf03608b80890a0c0d376275b1868d1cf03ecf4.tar.xz anaconda-6bf03608b80890a0c0d376275b1868d1cf03ecf4.zip | |
dracut: remove workarounds for broken splitsep()
the splitsep function was buggy before, but it was fixed in dracut 019
so we don't need these workarounds anymore.
See upstream dracut commit f7cadaa843498c4b986f8a030fab39002ad108b6.
Related: 844c0c156ed2f27920257d86690f3017727f398e
Related: 700e985082b03abcbd3009de81885b8fbf72818b
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" ;; |