Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b128b2d14e5464313874738c82e04bbf58b44c66)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b128b2d14e5464313874738c82e04bbf58b44c66)
  • Date: Sun, 11 Jan 2009 14:10:26 -0600

GIT changes to test cauldron by Justin Boffemmyer <flux AT sourcemage.org>:

data/initrd.files | 44 --------------------------------------------
scripts/mkinitrd.sh | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 44 deletions(-)

New commits:
commit b128b2d14e5464313874738c82e04bbf58b44c66
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

install udev into initrd using cache, not manually

Removed references to udev files from initrd.files, and added logic to
minitrd.sh to unpack the udev cache file found inside ISODIR into the
initrd. The unpacking excludes dirs and files not needed in the initrd,
like documentation, logs, etc.

diff --git a/data/initrd.files b/data/initrd.files
index 6764446..2c04e52 100644
--- a/data/initrd.files
+++ b/data/initrd.files
@@ -20,47 +20,3 @@ rmmod
/bin/sh
pidof
killall5
-udevadm
-udevd
-udevinfo
-/etc/modprobe.d/udev
-/etc/scsi_id.config
-/etc/udev/rules.d/40-alsa.rules
-/etc/udev/rules.d/51-udev-default.rules
-/etc/udev/rules.d/52-modules.rules
-/etc/udev/rules.d/76-cdrom_perms.rules
-/etc/udev/rules.d/README
-/etc/udev/rules.d/rules.examples
-/etc/udev/udev.conf
-/etc/udev/udev.missing
-/lib/libudev.so.0
-/lib/libudev.so.0.0.2
-/lib/libvolume_id.so.1
-/lib/libvolume_id.so.1.0.2
-/lib/udev/ata_id
-/lib/udev/cdrom_id
-/lib/udev/create_floppy_devices
-/lib/udev/edd_id
-/lib/udev/firmware.sh
-/lib/udev/fstab_import
-/lib/udev/path_id
-/lib/udev/rule_generator.functions
-/lib/udev/rules.d/50-udev-default.rules
-/lib/udev/rules.d/60-cdrom_id.rules
-/lib/udev/rules.d/60-persistent-input.rules
-/lib/udev/rules.d/60-persistent-storage-tape.rules
-/lib/udev/rules.d/60-persistent-storage.rules
-/lib/udev/rules.d/60-persistent-v4l.rules
-/lib/udev/rules.d/61-persistent-storage-edd.rules
-/lib/udev/rules.d/75-cd-aliases-generator.rules
-/lib/udev/rules.d/75-persistent-net-generator.rules
-/lib/udev/rules.d/79-fstab_import.rules
-/lib/udev/rules.d/80-drivers.rules
-/lib/udev/rules.d/95-udev-late.rules
-/lib/udev/scsi_id
-/lib/udev/usb_id
-/lib/udev/vol_id
-/lib/udev/write_cd_rules
-/lib/udev/write_net_rules
-/usr/lib/libudev.so
-/usr/lib/libvolume_id.so
diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh
index b3412c6..72eb988 100755
--- a/scripts/mkinitrd.sh
+++ b/scripts/mkinitrd.sh
@@ -99,6 +99,13 @@ then
exit 2
fi >&2

+if [[ ! -f "$ISODIR"/var/cache/sorcery/udev* ]]
+then
+ echo "Chroot failed sanity check:"
+ echo "Chroot is missing the udev cache file!"
+ exit 2
+fi >&2
+
# The temporary dir I'll use to put the initrd files
INITRDROOT=/tmp/initrd-dir

@@ -203,6 +210,16 @@ function mk_initrd_file() {
fi
}

+function install_udev() {
+ local udev="$ISODIR/var/cache/udev*"
+ local exclude=(init.d doc man var)
+
+ if ! tar xf $udev "${exclude[@]/#/--exclude=}" -C "$INITRDROOT"
+ then
+ echo "error: could not extract $udev to $INITRDROOT"
+ exit 2
+ fi
+}

# Find my stuff
MYDIR=$(readlink -f ${0%/*}/..)
@@ -280,6 +297,10 @@ cp sbin/depmod ${INITRDROOT}
chroot ${INITRDROOT} /depmod ${KERNEL_VERSION}
rm -f ${INITRDROOT}/depmod

+# install udev
+echo "installing udev into the initrd"
+install_udev
+
# The initrd is complete now.
echo "Make the initrd"
popd >/dev/null



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b128b2d14e5464313874738c82e04bbf58b44c66), Justin Boffemmyer, 01/11/2009

Archive powered by MHonArc 2.6.24.

Top of Page