[Lunar-commits] <lunar-iso> Initrd related changes * Updated udev helpers * Moved /lib/ld-* from initrd.list -> scripts/initrd since the version change between glibc releases

[Stefan Wold]

commit 257e05dfddafc904982deb6c0aac62d2eeb55da4
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Wed Jul 7 16:05:36 2010 +0200

    Initrd related changes
    * Updated udev helpers
    * Moved /lib/ld-* from initrd.list -> scripts/initrd since the version change between glibc releases
---
 initrd/initrd.list     |    2 --
 initrd/initrd.list-2.6 |    7 ++++++-
 scripts/initrd         |   11 ++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/initrd/initrd.list b/initrd/initrd.list
index e26ff53..a9dd381 100644
--- a/initrd/initrd.list
+++ b/initrd/initrd.list
@@ -21,8 +21,6 @@ bin/uname
 etc/fstab
 etc/ld.so.conf
 etc/mtab
-lib/ld-2.10.1.so
-lib/ld-linux.so.2
 sbin/halt
 sbin/ldconfig
 sbin/pivot_root
diff --git a/initrd/initrd.list-2.6 b/initrd/initrd.list-2.6
index b1355a9..c60d027 100644
--- a/initrd/initrd.list-2.6
+++ b/initrd/initrd.list-2.6
@@ -16,14 +16,19 @@ lib/udev/hid2hci
 lib/udev/input_id
 lib/udev/keyboard-force-release.sh
 lib/udev/keymap
-lib/udev/modem-modeswitch
+lib/udev/mobile-action-modeswitch
+lib/udev/mtd_probe
 lib/udev/path_id
 lib/udev/pci-db
+lib/udev/pcmcia-check-broken-cis
+lib/udev/pcmcia-socket-startup
 lib/udev/rule_generator.functions
 lib/udev/scsi_id
 lib/udev/udev-acl
 lib/udev/usb-db
 lib/udev/usb_id
 lib/udev/v4l_id
+lib/udev/write_cd_rules
+lib/udev/write_net_rules
 sbin/udevadm
 sbin/udevd
diff --git a/scripts/initrd b/scripts/initrd
index 5de077f..522fe84 100755
--- a/scripts/initrd
+++ b/scripts/initrd
@@ -48,6 +48,7 @@ transfer()
 	cd $ISO_TARGET
 	cat $ISO_SOURCE/initrd/initrd.list | transfer
 	cat $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
+	find lib/ -name "ld-*" | transfer
 	$ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list | transfer
 	$ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
 )
@@ -149,17 +150,17 @@ else
 fi &&
 
 dd if=/dev/zero of=initrd.raw bs=1024 count=$SIZE &&
-losetup /dev/loop/0 initrd.raw &&
-mkfs.ext2 -b 1024 -m 0 -i 1024 -N 768 /dev/loop/0 &&
+losetup /dev/loop0 initrd.raw &&
+mkfs.ext2 -b 1024 -m 0 -i 1024 -N 768 /dev/loop0 &&
 mkdir BUILD.mnt &&
-mount /dev/loop/0 BUILD.mnt &&
+mount /dev/loop0 BUILD.mnt &&
 cp -a BUILD/* BUILD.mnt/ &&
 df -h BUILD.mnt/
 
 umount BUILD.mnt || exit 1
 
-tune2fs -l /dev/loop/0 | grep -e 'Free'
-losetup -d /dev/loop/0
+tune2fs -l /dev/loop0 | grep -e 'Free'
+losetup -d /dev/loop0
 
 [ -f initrd ] && rm initrd
 gzip -c initrd.raw > initrd