QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: fix dracut module to work with reduced dependencies

Browse Source 
Do not fail because of not present url-lib. Also 'loop' module requires manual
loading now.
This commit is contained in:
Marek Marczykowski-Górecki 2015-09-18 03:56:09 +02:00
parent 4868764d81
commit 447ba8ab42
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anaconda/dracut/anaconda-diskroot
View File

@ -35,6 +35,8 @@ path="$2" # optional, could be empty
[ -e "/dev/root" ] && exit 1 # we already have a root device! [ -e "/dev/root" ] && exit 1 # we already have a root device!
modprobe -q loop
info "anaconda using disk root at $dev" info "anaconda using disk root at $dev"
mount $dev $repodir || warn "Couldn't mount $dev" mount $dev $repodir || warn "Couldn't mount $dev"
anaconda_live_root_dir $repodir $path anaconda_live_root_dir $repodir $path

2
anaconda/dracut/module-setup.sh
View File

@ -7,7 +7,7 @@ check() {
} }
depends() { depends() {
echo img-lib echo img-lib dmsquash-live
case "$(uname -m)" in case "$(uname -m)" in
s390*) echo cms ;; s390*) echo cms ;;
esac esac

6
anaconda/dracut/parse-anaconda-options.sh
View File

@ -2,7 +2,11 @@
# parse-anaconda-options.sh - parse installer-specific options # parse-anaconda-options.sh - parse installer-specific options
. /lib/anaconda-lib.sh . /lib/anaconda-lib.sh
. /lib/url-lib.sh if [ -r /lib/url-lib.sh ]; then
. /lib/url-lib.sh
else
alias set_http_header=:
fi
# create the repodir and isodir that anaconda will look for # create the repodir and isodir that anaconda will look for
mkdir -p $repodir $isodir mkdir -p $repodir $isodir