[Foresight-commits] Source: mkinitrd=6.0.93-8

[rbui...@rpath.com]

================================
mkinitrd:source=6.0.93-8 (previous: 6.0.93-7)
cvc rdiff mkinitrd -1 /foresight.rpath.org@fl:2-devel/6.0.93-8
================================
6.0.93-8 Antonio Meireles aka doniphon (sb...@reboot.sh) Tue Sep 7 07:52:37 2010
fix get_numeric_dev.sh to match current initscripts we ship atm; re-enable libata-migrate.patch hoping that anaconda gets a bit more friendly...

libata-migrate.patch: new
--- /dev/null
+++ libata-migrate.patch
@@ -0,0 +30 @@
+--- mkinitrd.orig 2010-05-14 21:50:13.000000000 -0400
++++ mkinitrd 2010-05-14 21:53:23.000000000 -0400
+@@ -1721,6 +1721,27 @@
+ emitcrypto `eval echo '$'$cryptdev`
+ done
+
++if [ -x /sbin/libata-migrate-links ]; then
++ /sbin/libata-migrate-links
++ for i in /boot/grub/grub.conf /etc/bootloader.conf /etc/fstab \
++ /etc/smartd.conf /boot/grub/device.map /etc/mtools.conf $RCFILE
++ do
++ [ -f $i ] && DEVSUB="$DEVSUB $i"
++ done
++ rm -f /etc/sysconfig/devsub # or it may not modify $RCFILE
++ [ -n "$DEVSUB" ] && /usr/bin/devsub /etc/sysconfig $DEVSUB
++ rm -f /etc/blkid.tab /etc/lvm/cache/.cache
++
++ inst /bin/ash.static "$MNTIMAGE" /bin/ash
++ ln -s ash "$MNTIMAGE"/bin/bash
++ for i in /sbin/libata-migrate-links /bin/ln /bin/mkdir /bin/basename \
++ /bin/cat /bin/sed /sbin/*.libata-migrate
++ do
++ inst $i "$MNTIMAGE"
++ done
++ emit "/sbin/libata-migrate-links"
++fi
++
+ if [ -z "$noresume" -a -n "$thawdev" ]; then
+ emit "resume $thawdev"
+ fi

get_numeric_dev.sh: changed
Index: get_numeric_dev.sh
====================================================================
contents(size sha1)
inode(mtime owner group)
--- get_numeric_dev.sh /foresight.rpath.org@fl:2-devel/6.0.93-7
+++ get_numeric_dev.sh /foresight.rpath.org@fl:2-devel/6.0.93-8
@@ -1,7 +1,7 @@
get_numeric_dev() {
(
fmt="%d:%d"
- if [ "$1" == "hex" ]; then
+ if [ "$1" = "hex" ]; then
fmt="%x:%x"
fi
ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }'

mkinitrd.recipe: changed
Index: mkinitrd.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- mkinitrd.recipe /foresight.rpath.org@fl:2-devel/6.0.93-7
+++ mkinitrd.recipe /foresight.rpath.org@fl:2-devel/6.0.93-8
@@ -61,6 +61,11 @@

# Return error if fstab is not found (RPL-1959).
r.addPatch('fstab.patch')
+
+ # integrate libata-migrate
+ # point here isn't exactly to allow migration from pre-historic
+ # setups but to try to get anaconda to behave with minimal mods
+ r.addPatch('libata-migrate.patch')

# Include all PATA modules to facilitate libata migration
r.addPatch('mkinitrd-modules.libata.patch')

Committed by: antonio.meireles
_______________________________________________
Foresight-commits mailing list
Foresigh...@lists.rpath.org
http://lists.rpath.org/mailman/listinfo/foresight-commits