diff options
| author | Martin Sivak <msivak@redhat.com> | 2013-03-04 12:12:07 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2013-03-25 14:23:14 +0100 |
| commit | 8ee731c07a2356c82f2337035ef2f46eeb4b46f5 (patch) | |
| tree | dad58a6307d76b789a6c0c620da046a769ca5fb1 | |
| parent | 7ab8870ce699d1561c9671f03420ebceadac5b57 (diff) | |
| download | anaconda-8ee731c07a2356c82f2337035ef2f46eeb4b46f5.tar.gz anaconda-8ee731c07a2356c82f2337035ef2f46eeb4b46f5.tar.xz anaconda-8ee731c07a2356c82f2337035ef2f46eeb4b46f5.zip | |
Remove debug shells and copy data to anaconda environment
| -rw-r--r-- | dracut/anaconda-copy-driver-updates.sh | 16 | ||||
| -rwxr-xr-x | dracut/driver-updates.sh | 2 | ||||
| -rwxr-xr-x | dracut/module-setup.sh | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/dracut/anaconda-copy-driver-updates.sh b/dracut/anaconda-copy-driver-updates.sh new file mode 100644 index 000000000..353407fdd --- /dev/null +++ b/dracut/anaconda-copy-driver-updates.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# copy dup runtime files and downloaded DUPs +cp -ar /tmp/dud* /tmp/DD-* /sysroot/tmp + +# copy all modules and firmwares +for dud in /tmp/duds/DD-*; do + # copy modules and firmwares to the proper directories + # modules are in <kernel version>/{kernel,updates,extra}/* structure so + # strip the kernel version and the first directory name of it + mkdir -p "/sysroot/lib/modules/$(uname -r)/updates" "/sysroot/lib/firmware/updates" + cp -r $dud/lib/modules/*/*/* "/sysroot/lib/modules/$(uname -r)/updates/" + cp -r $dud/lib/firmware/* /sysroot/lib/firmware/ +done + +# regenerate modules.* files +depmod -b /sysroot diff --git a/dracut/driver-updates.sh b/dracut/driver-updates.sh index f606c48bd..3d09d0d54 100755 --- a/dracut/driver-updates.sh +++ b/dracut/driver-updates.sh @@ -201,8 +201,6 @@ function driverupdatedisc() # copy binaries and libraries to / directory # TODO - - sh # save the list of extracted modules for later use in anaconda cat /tmp/dud_extract.txt >>/tmp/dud_extracted.txt diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index 0b743de25..09f893b60 100755 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -37,6 +37,7 @@ install() { inst_hook initqueue/online 80 "$moddir/anaconda-netroot.sh" inst "$moddir/anaconda-diskroot" "/sbin/anaconda-diskroot" inst_hook pre-pivot 50 "$moddir/anaconda-copy-ks.sh" + inst_hook pre-pivot 50 "$moddir/anaconda-copy-driver-updates.sh" inst_hook pre-pivot 50 "$moddir/anaconda-copy-cmdline.sh" inst_hook pre-pivot 99 "$moddir/save-initramfs.sh" inst_hook pre-shutdown 50 "$moddir/anaconda-pre-shutdown.sh" |