summaryrefslogtreecommitdiff
path: root/mkinitramfs
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-09-01 16:18:29 +0200
committermaximilian attems <maks@debian.org>2006-09-01 16:18:29 +0200
commit8ae9783215c2845b50dfb70b919df0753c2b0dd9 (patch)
tree78bdbb775a3cc2d3ec8e4f2cc1026ea8aff6dc5f /mkinitramfs
parent45989c9f37db0ef23e984ea559f2da784a028366 (diff)
downloadinitramfs-tools-8ae9783215c2845b50dfb70b919df0753c2b0dd9.tar.gz
initramfs-tools-8ae9783215c2845b50dfb70b919df0753c2b0dd9.zip
- fix destination of the mdrun.conf for partial sarge upgrades
- checkout if /sbin/lilo is really there - guard more dirs against creation - add /etc/kernel-img.conf to reportbug output
Diffstat (limited to 'mkinitramfs')
-rwxr-xr-xmkinitramfs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkinitramfs b/mkinitramfs
index d088efa..c36e845 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -239,7 +239,7 @@ run_scripts "${CONFDIR}"/hooks
if [ -x /sbin/mdadm ] && [ ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then
# use mkinitrd magic for Sarge backwards compat
rootraiddev="$(df / | sed -rne 's,^(/dev/[^[:space:]]+).*,\1,p')"
- echo "rootraiddev=${rootraiddev}" > /conf/mdrun.conf
+ echo "rootraiddev=${rootraiddev}" > ${DESTDIR}/conf/mdrun.conf
mdadm=$(mdadm --detail "${rootraiddev}")
echo "${mdadm}" | awk '
$1 == "Number" && $2 == "Major" { start = 1; next }
@@ -248,7 +248,7 @@ if [ -x /sbin/mdadm ] && [ ! -f /usr/share/initramfs-tools/hooks/mdadm ]; then
$2 == 0 && $3 == 0 { next }
{ devices = devices " " $NF }
END { print "devices='\''" devices "'\''" }' \
- >> /conf/mdrun.conf
+ >> ${DESTDIR}/conf/mdrun.conf
copy_exec /sbin/mdadm /sbin
for x in md linear multipath raid0 raid1 raid456 raid5 raid6 raid10; do
manual_add_modules ${x}