diff options
author | Will Woods <wwoods@redhat.com> | 2012-04-25 19:33:07 -0400 |
---|---|---|
committer | Will Woods <wwoods@redhat.com> | 2012-05-01 17:17:25 -0400 |
commit | e1b19050f22197fd394eb122a9caefe2d487fc4f (patch) | |
tree | 73df875274ac45bcd1fe780a122bf184b2a1d66c /dracut | |
parent | 5013f0dd67222e45ca4028c89f7dde6ff47cf2ec (diff) | |
download | anaconda-e1b19050f22197fd394eb122a9caefe2d487fc4f.tar.gz anaconda-e1b19050f22197fd394eb122a9caefe2d487fc4f.tar.xz anaconda-e1b19050f22197fd394eb122a9caefe2d487fc4f.zip |
dracut: support updates=hd:... (#807982)
Since we've removed all UI from initramfs, plain 'updates' no longer
works if you want to load an updates image from disk.
This adds support for fetching updates images, much the same way as we
do with kickstarts.
Note that I'd really like to merge all the *-genrules.sh / fetch-*-disk
junk, but time is short..
Diffstat (limited to 'dracut')
-rw-r--r-- | dracut/Makefile.am | 4 | ||||
-rwxr-xr-x | dracut/anaconda-lib.sh | 4 | ||||
-rwxr-xr-x | dracut/fetch-updates-disk | 33 | ||||
-rwxr-xr-x | dracut/module-setup.sh | 2 | ||||
-rwxr-xr-x | dracut/parse-anaconda-options.sh | 16 | ||||
-rwxr-xr-x | dracut/updates-genrules.sh | 22 |
6 files changed, 76 insertions, 5 deletions
diff --git a/dracut/Makefile.am b/dracut/Makefile.am index 2efe38da4..032476676 100644 --- a/dracut/Makefile.am +++ b/dracut/Makefile.am @@ -26,13 +26,15 @@ dist_dracut_SCRIPTS = module-setup.sh \ parse-anaconda-kickstart.sh \ parse-anaconda-net.sh \ repo-genrules.sh \ - anaconda-udevprop.sh \ kickstart-genrules.sh \ + updates-genrules.sh \ + anaconda-udevprop.sh \ anaconda-netroot.sh \ anaconda-diskroot \ anaconda-copy-ks.sh \ fetch-kickstart-net.sh \ fetch-kickstart-disk \ + fetch-updates-disk \ parse-kickstart \ anaconda-modprobe.sh diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 476c6c82d..49c4f9ee9 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -188,3 +188,7 @@ run_kickstart() { wait_for_kickstart() { echo "[ -e /tmp/ks.cfg.done ]" > $hookdir/initqueue/finished/kickstart.sh } + +wait_for_updates() { + echo "[ -e /tmp/liveupdates.done ]" > $hookdir/initqueue/finished/updates.sh +} diff --git a/dracut/fetch-updates-disk b/dracut/fetch-updates-disk new file mode 100755 index 000000000..168fe5d19 --- /dev/null +++ b/dracut/fetch-updates-disk @@ -0,0 +1,33 @@ +#!/bin/bash +# fetch-updates-disk - fetch updates from a block device + +command -v getarg >/dev/null || . /lib/dracut-lib.sh +command -v unpack_updates_img >/dev/null || . /lib/anaconda-lib.sh + +dev="$1" +path="${2:-/updates.img}" + +[ -d "$path" ] && path=$path/updates.img +[ -b "$dev" ] || exit 1 + +info "anaconda: fetching updates from $dev:$path" + +mnt="$(find_mount $dev)" +if [ -n "$mnt" ]; then + cp $mnt$path /tmp/updates.img +else + tmpmnt="$(mkuniqdir /run/install tmpmnt)" + if mount -o ro $dev $tmpmnt; then + cp $tmpmnt$path /tmp/updates.img + umount $tmpmnt + fi + rmdir $tmpmnt +fi + +if [ -f /tmp/updates.img ]; then + unpack_updates_img /tmp/updates.img /updates + rm /tmp/updates.img + echo "$dev:$path" >> /tmp/liveupdates.done +else + warn "anaconda: failed to get updates from $dev:$path" +fi diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index ceac67f5c..39ecc58d3 100755 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -24,6 +24,7 @@ install() { inst_hook cmdline 28 "$moddir/parse-anaconda-net.sh" inst_hook pre-udev 40 "$moddir/repo-genrules.sh" inst_hook pre-udev 40 "$moddir/kickstart-genrules.sh" + inst_hook pre-udev 40 "$moddir/updates-genrules.sh" inst_hook pre-trigger 40 "$moddir/anaconda-udevprop.sh" inst_hook initqueue/online 80 "$moddir/anaconda-netroot.sh" inst "$moddir/anaconda-diskroot" "/sbin/anaconda-diskroot" @@ -31,6 +32,7 @@ install() { # kickstart parsing, WOOOO inst_hook initqueue/online 10 "$moddir/fetch-kickstart-net.sh" inst "$moddir/fetch-kickstart-disk" "/sbin/fetch-kickstart-disk" + inst "$moddir/fetch-updates-disk" "/sbin/fetch-updates-disk" inst "$moddir/parse-kickstart" "/sbin/parse-kickstart" # python deps for parse-kickstart. DOUBLE WOOOO $moddir/python-deps $moddir/parse-kickstart | while read dep; do diff --git a/dracut/parse-anaconda-options.sh b/dracut/parse-anaconda-options.sh index 0076fce40..1343ebc28 100755 --- a/dracut/parse-anaconda-options.sh +++ b/dracut/parse-anaconda-options.sh @@ -101,10 +101,18 @@ warn_renamed_arg "kssendmac" "inst.ks.sendmac" warn_renamed_arg "kssendsn" "inst.ks.sendsn" # updates -warn_renamed_arg "updates" "inst.updates" -updates=$(getarg updates inst.updates) -if [ -n "$updates" ]; then - echo "live.updates=$updates" >> /etc/cmdline.d/75-anaconda-options.conf +warn_renamed_arg "updates=" "inst.updates" +if updates=$(getarg updates inst.updates); then + if [ -n "$updates" ]; then + export anac_updates=$updates + case $updates in + http*|ftp*|nfs*) + echo "live.updates=$updates" \ + >> /etc/cmdline.d/75-anaconda-options.conf ;; + esac + else + warn "'updates' requires a location for the updates disk" + fi fi # make sure we get ifcfg for every interface that comes up diff --git a/dracut/updates-genrules.sh b/dracut/updates-genrules.sh new file mode 100755 index 000000000..3ed1e2c9a --- /dev/null +++ b/dracut/updates-genrules.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# generate udev rules for fetching updates + +updates=$anac_updates +[ -n "$updates" ] || return +case $updates in + # updates=<url>: handled by livenet's fetch-liveupdate.sh + http*|ftp*|nfs*) + wait_for_updates + ;; + # updates=<disk>:<path> + # <disk> is sdb, /dev/sdb, LABEL=xxx, UUID=xxx + # <path> defaults to /updates.img if missing + *) + # accept hd:<dev>:<path> (or cdrom:<dev>:<path>) + updates=${updates#hd:}; updates=${updates#cdrom:} + splitsep ":" "$updates" dev path + dev=$(disk_to_dev_path $dev) + when_diskdev_appears $dev fetch-updates-disk \$env{DEVNAME} $path + wait_for_updates + ;; +esac |