[dracut] dracut-020-57.git20120709
Harald Hoyer
harald at fedoraproject.org
Mon Jul 9 08:19:33 UTC 2012
commit c671e470fabc8c0b5032c98928d85eba712bedcf
Author: Harald Hoyer <harald at redhat.com>
Date: Mon Jul 9 10:19:06 2012 +0200
dracut-020-57.git20120709
- more fixups for systemd-udevd unit renaming
...v-trigger.service-and-systemd-udev-settle.patch | 64 +++++++++
0056-TEST-30-ISCSI-convert-to-ext3.patch | 150 ++++++++++++++++++++
dracut.spec | 7 +-
3 files changed, 220 insertions(+), 1 deletions(-)
---
diff --git a/0055-systemd-udev-trigger.service-and-systemd-udev-settle.patch b/0055-systemd-udev-trigger.service-and-systemd-udev-settle.patch
new file mode 100644
index 0000000..df5d7c3
--- /dev/null
+++ b/0055-systemd-udev-trigger.service-and-systemd-udev-settle.patch
@@ -0,0 +1,64 @@
+From b4e20a898ef2f5985a30282c93a21bc14efe7309 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 9 Jul 2012 10:12:04 +0200
+Subject: [PATCH] systemd-udev-trigger.service and systemd-udev-settle.service
+ have no "d"
+
+---
+ modules.d/98systemd/dracut-initqueue.service | 4 ++--
+ modules.d/98systemd/dracut-pre-trigger.service | 2 +-
+ modules.d/98systemd/module-setup.sh | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service
+index 73bc1e1..5168677 100644
+--- a/modules.d/98systemd/dracut-initqueue.service
++++ b/modules.d/98systemd/dracut-initqueue.service
+@@ -10,8 +10,8 @@
+ [Unit]
+ Description=Dracut initqueue hook
+ DefaultDependencies=no
+-After=systemd-udevd-trigger.service
+-Wants=systemd-udevd-trigger.service
++After=systemd-udev-trigger.service
++Wants=systemd-udev-trigger.service
+ ConditionPathExists=/etc/initrd-release
+
+ [Service]
+diff --git a/modules.d/98systemd/dracut-pre-trigger.service b/modules.d/98systemd/dracut-pre-trigger.service
+index 450ed20..86c7c5e 100644
+--- a/modules.d/98systemd/dracut-pre-trigger.service
++++ b/modules.d/98systemd/dracut-pre-trigger.service
+@@ -10,7 +10,7 @@
+ [Unit]
+ Description=Dracut pre-trigger hook
+ DefaultDependencies=no
+-Before=systemd-udevd-trigger.service dracut-initqueue.service
++Before=systemd-udev-trigger.service dracut-initqueue.service
+ After=dracut-pre-udev.service systemd-udevd.service
+ Wants=dracut-pre-udev.service systemd-udevd.service
+ ConditionPathExists=/etc/initrd-release
+diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
+index 543db7e..0387ec4 100755
+--- a/modules.d/98systemd/module-setup.sh
++++ b/modules.d/98systemd/module-setup.sh
+@@ -67,8 +67,8 @@ install() {
+ $systemdsystemunitdir/kexec.service \
+ $systemdsystemunitdir/fsck at .service \
+ $systemdsystemunitdir/systemd-udevd.service \
+- $systemdsystemunitdir/systemd-udevd-trigger.service \
+- $systemdsystemunitdir/systemd-udevd-settle.service \
++ $systemdsystemunitdir/systemd-udev-trigger.service \
++ $systemdsystemunitdir/systemd-udev-settle.service \
+ $systemdsystemunitdir/systemd-ask-password-plymouth.service \
+ $systemdsystemunitdir/systemd-journald.service \
+ $systemdsystemunitdir/systemd-vconsole-setup.service \
+@@ -82,7 +82,7 @@ install() {
+ $systemdsystemunitdir/sockets.target.wants/systemd-udevd-kernel.socket \
+ $systemdsystemunitdir/sockets.target.wants/systemd-journald.socket \
+ $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \
+- $systemdsystemunitdir/sysinit.target.wants/systemd-udevd-trigger.service \
++ $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \
+ $systemdsystemunitdir/ctrl-alt-del.target \
+ $systemdsystemunitdir/single.service \
+ $systemdsystemunitdir/syslog.socket \
diff --git a/0056-TEST-30-ISCSI-convert-to-ext3.patch b/0056-TEST-30-ISCSI-convert-to-ext3.patch
new file mode 100644
index 0000000..b5dc583
--- /dev/null
+++ b/0056-TEST-30-ISCSI-convert-to-ext3.patch
@@ -0,0 +1,150 @@
+From cbefa470063eedb80da1317566668d8ec03d89c0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Mon, 9 Jul 2012 10:16:33 +0200
+Subject: [PATCH] TEST-30-ISCSI: convert to ext3
+
+---
+ test/TEST-30-ISCSI/client-init.sh | 2 +-
+ test/TEST-30-ISCSI/create-root.sh | 4 ++--
+ test/TEST-30-ISCSI/test.sh | 29 +++++++++++++++--------------
+ 3 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/test/TEST-30-ISCSI/client-init.sh b/test/TEST-30-ISCSI/client-init.sh
+index 1b9d633..e78db27 100755
+--- a/test/TEST-30-ISCSI/client-init.sh
++++ b/test/TEST-30-ISCSI/client-init.sh
+@@ -6,7 +6,7 @@ export PS1='initramfs-test:\w\$ '
+ stty sane
+ echo "made it to the rootfs! Powering down."
+ while read dev fs fstype opts rest; do
+- [ "$fstype" != "ext2" ] && continue
++ [ "$fstype" != "ext3" ] && continue
+ echo "iscsi-OK $dev $fstype $opts" > /dev/sda
+ break
+ done < /proc/mounts
+diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh
+index 2b7cac1..6016320 100755
+--- a/test/TEST-30-ISCSI/create-root.sh
++++ b/test/TEST-30-ISCSI/create-root.sh
+@@ -5,7 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
+ done
+ rm /etc/lvm/lvm.conf
+ udevadm control --reload-rules
+-mke2fs -F /dev/sda && \
++mkfs.ext3 -j -F /dev/sda && \
+ mkdir -p /sysroot && \
+ mount /dev/sda /sysroot && \
+ cp -a -t /sysroot /source/* && \
+@@ -16,7 +16,7 @@ lvm pvcreate -ff -y /dev/md0 && \
+ lvm vgcreate dracut /dev/md0 && \
+ lvm lvcreate -l 100%FREE -n root dracut && \
+ lvm vgchange -ay && \
+-mke2fs -L sysroot /dev/dracut/root && \
++mkfs.ext3 -j -L sysroot /dev/dracut/root && \
+ mount /dev/dracut/root /sysroot && \
+ cp -a -t /sysroot /source/* && \
+ umount /sysroot && \
+diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
+index 5ebd9ac..8c577f0 100755
+--- a/test/TEST-30-ISCSI/test.sh
++++ b/test/TEST-30-ISCSI/test.sh
+@@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem over iSCSI"
+ KVERSION=${KVERSION-$(uname -r)}
+
+ #DEBUGFAIL="rd.shell"
+-#SERIAL="-serial udp:127.0.0.1:9999"
++#SERIAL="tcp:127.0.0.1:9999"
+ SERIAL="null"
+
+ run_server() {
+@@ -12,15 +12,16 @@ run_server() {
+ echo "iSCSI TEST SETUP: Starting DHCP/iSCSI server"
+
+ $testdir/run-qemu \
+- -hda $TESTDIR/server.ext2 \
+- -hdb $TESTDIR/root.ext2 \
++ -hda $TESTDIR/server.ext3 \
++ -hdb $TESTDIR/root.ext3 \
+ -hdc $TESTDIR/iscsidisk2.img \
+ -hdd $TESTDIR/iscsidisk3.img \
+ -m 256M -nographic \
++ -serial $SERIAL \
+ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \
+ -net socket,listen=127.0.0.1:12330 \
+ -kernel /boot/vmlinuz-$KVERSION \
+- -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \
++ -append "root=/dev/sda rootfstype=ext3 rw rd.debug loglevel=77 console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.server \
+ -pidfile $TESTDIR/server.pid -daemonize || return 1
+ sudo chmod 644 $TESTDIR/server.pid || return 1
+@@ -94,7 +95,7 @@ test_setup() {
+ fi
+
+ # Create the blank file to use as a root filesystem
+- dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=20
++ dd if=/dev/null of=$TESTDIR/root.ext3 bs=1M seek=20
+ dd if=/dev/null of=$TESTDIR/iscsidisk2.img bs=1M seek=20
+ dd if=/dev/null of=$TESTDIR/iscsidisk3.img bs=1M seek=20
+
+@@ -119,7 +120,7 @@ test_setup() {
+ (
+ initdir=$TESTDIR/overlay
+ . $basedir/dracut-functions.sh
+- dracut_install sfdisk mke2fs poweroff cp umount
++ dracut_install sfdisk mkfs.ext3 poweroff cp umount
+ inst_hook initqueue 01 ./create-root.sh
+ inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
+ )
+@@ -129,7 +130,7 @@ test_setup() {
+ # devices, volume groups, encrypted partitions, etc.
+ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \
+- -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
++ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
+ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
+ rm -rf $TESTDIR/overlay
+
+@@ -141,13 +142,13 @@ test_setup() {
+ fi
+ # Invoke KVM and/or QEMU to actually create the target filesystem.
+ $testdir/run-qemu \
+- -hda $TESTDIR/root.ext2 \
++ -hda $TESTDIR/root.ext3 \
+ -hdb $TESTDIR/client.img \
+ -hdc $TESTDIR/iscsidisk2.img \
+ -hdd $TESTDIR/iscsidisk3.img \
+ -m 256M -nographic -net none \
+ -kernel "/boot/vmlinuz-$kernel" \
+- -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
++ -append "root=/dev/dracut/root rw rootfstype=ext3 quiet console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.makeroot || return 1
+ grep -m 1 -q dracut-root-block-created $TESTDIR/client.img || return 1
+ rm $TESTDIR/client.img
+@@ -161,14 +162,14 @@ test_setup() {
+ sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth dmraid" \
+ -a "debug" \
+- -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
++ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
+
+ # Make server root
+- dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=60
+- mke2fs -F $TESTDIR/server.ext2
++ dd if=/dev/null of=$TESTDIR/server.ext3 bs=1M seek=60
++ mkfs.ext3 -j -F $TESTDIR/server.ext3
+ mkdir $TESTDIR/mnt
+- sudo mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt
++ sudo mount -o loop $TESTDIR/server.ext3 $TESTDIR/mnt
+
+ kernel=$KVERSION
+ (
+@@ -210,7 +211,7 @@ test_setup() {
+ # Make server's dracut image
+ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -m "dash udev-rules base rootfs-block debug kernel-modules" \
+- -d "piix ide-gd_mod ata_piix ext2 sd_mod e1000" \
++ -d "piix ide-gd_mod ata_piix ext3 sd_mod e1000" \
+ -f $TESTDIR/initramfs.server $KVERSION || return 1
+
+ }
diff --git a/dracut.spec b/dracut.spec
index f56f517..2bbfc9e 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
Name: dracut
Version: 020
-Release: 55.git20120709%{?dist}
+Release: 57.git20120709%{?dist}
Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel}
@@ -83,6 +83,8 @@ Patch51: 0051-dracut.conf.d-fedora.conf.example-removed-readonly-f.patch
Patch52: 0052-dracut-functions.sh-bail-out-if-initdir-is-not-set.patch
Patch53: 0053-dracut.sh-corrected-error-messages-if-mktemp-failed.patch
Patch54: 0054-require-systemd-186.patch
+Patch55: 0055-systemd-udev-trigger.service-and-systemd-udev-settle.patch
+Patch56: 0056-TEST-30-ISCSI-convert-to-ext3.patch
BuildRequires: dash bash git
@@ -410,6 +412,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /var/lib/dracut/overlay
%changelog
+* Mon Jul 09 2012 Harald Hoyer <harald at redhat.com> 020-57.git20120709
+- more fixups for systemd-udevd unit renaming
+
* Mon Jul 09 2012 Harald Hoyer <harald at redhat.com> 020-55.git20120709
- require systemd >= 186
- more fixups for systemd-udevd unit renaming
More information about the scm-commits
mailing list