I have made the following changes intended for : CE:Adaptation:x86-generic / mkinitrd
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5665 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5665: Messages from BOSS: State: review at 2012-08-13T16:05:47 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:mer:x86-fix / mkinitrd -> CE:Adaptation:x86-generic / mkinitrd changes files: -------------- --- mkinitrd.changes +++ mkinitrd.changes @@ -0,0 +1,4 @@ +* Mon Jul 23 2012 Marko Saukko <[email protected]> - 7.0.17 +- Added 0001-Fix-for-systemd-187.patch +- Dropped 0001-udevd-was-moved-to-lib-udev-from-sbin-in-udev-174.patch + old: ---- 0001-udevd-was-moved-to-lib-udev-from-sbin-in-udev-174.patch new: ---- 0001-Fix-for-systemd-187.patch spec files: ----------- --- mkinitrd.spec +++ mkinitrd.spec @@ -12,9 +12,7 @@ Patch4: systemd_mkinitrd_live_mrst.patch Patch5: modprobe_conf.patch Patch6: mount-run-and-create-dirs-for-udev.patch -Patch7: 0001-udevd-was-moved-to-lib-udev-from-sbin-in-udev-174.patch -ExclusiveOs: Linux -Requires(pre): udev +Patch7: 0001-Fix-for-systemd-187.patch Requires: /bin/sh, /sbin/losetup Requires: fileutils, mktemp >= 1.5-5 Requires: /bin/tar @@ -29,6 +27,10 @@ Requires: util-linux Requires: grubby Requires: psmisc +# New paths and files in kmod replaced module-init-tools +Requires: kmod >= 9 +# udevadm etc are in this. +Requires: systemd >= 187 # awk is required by /usr/libexec/mkliveinitrd Requires: /usr/bin/awk other changes: -------------- ++++++ 0001-Fix-for-systemd-187.patch (new) --- 0001-Fix-for-systemd-187.patch +++ 0001-Fix-for-systemd-187.patch @@ -0,0 +1,146 @@ +From 9c126fb63303198a9e313d45329cf3c06276d382 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Mon, 13 Aug 2012 15:20:48 +0000 +Subject: [PATCH] Fix for systemd >= 187 + +Signed-off-by: Marko Saukko <[email protected]> +--- + mkliveinitrd | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/mkliveinitrd b/mkliveinitrd +index c3c09a7..4b8b3f1 100755 +--- a/mkliveinitrd ++++ b/mkliveinitrd +@@ -77,7 +77,7 @@ mkdir initramfs_dir + cd initramfs_dir + + # Make directory structure +-mkdir bin sbin dev sys proc lib lib/udev sysroot etc etc/udev etc/udev/rules.d ++mkdir -p bin sbin dev sys proc lib lib/systemd lib/udev usr/bin sysroot etc etc/udev etc/udev/rules.d + + cp /sbin/losetup sbin + cp /sbin/blockdev sbin +@@ -156,6 +156,7 @@ cp /bin/bash bin + cp /bin/mount bin + cp /bin/umount bin + [ -x /usr/sbin/eject ] && cp /usr/sbin/eject sbin ++cp /bin/ps bin + cp /bin/ls bin + cp /bin/mknod bin + cp /bin/mkdir bin +@@ -164,15 +165,20 @@ cp /bin/ln bin + cp /bin/cat bin + cp /usr/bin/kill bin + cp /bin/rm bin ++cp /bin/find bin + +-cp /sbin/udevadm sbin +-cp /sbin/udevd sbin ++cp /usr/bin/udevadm usr/bin ++cp /lib/systemd/systemd-udevd lib/systemd/ ++ ++cp /usr/bin/kmod usr/bin + cp /sbin/insmod sbin + cp /sbin/modprobe sbin +-cp /usr/bin/killall sbin ++cp /sbin/pidof sbin ++cp /usr/bin/killall bin + cp /usr/sbin/chroot sbin + + cp /sbin/blkid sbin ++cp /sbin/fdisk sbin + + # symlink niceties + ln -s bash bin/sh +@@ -180,6 +186,7 @@ ln -s bash bin/sh + # Not really required but nice + [ -x /usr/bin/tree ] && cp /usr/bin/tree bin + [ -x /usr/bin/less ] && cp /usr/bin/less bin ++cp /bin/more bin + cp /bin/env bin + cp /bin/grep bin + cp /bin/dmesg bin +@@ -232,10 +239,7 @@ export PATH=/sbin:/bin + + exec < /dev/console > /dev/console 2>&1 + +-mount -n -t tmpfs -o mode=0755 udev /dev +-mknod /dev/console c 5 1 +-mknod /dev/null c 1 3 +-mknod /dev/kmsg c 1 11 ++mount -n -t devtmpfs -o mode=0755 none /dev + mkdir /dev/pts + mkdir -m 1777 /dev/shm + ln -s /proc/self/fd /dev/fd +@@ -326,7 +330,7 @@ for o in `cat /proc/cmdline` ; do + esac + done + +-pushd /etc; ln -sf ../proc/self/mounts mtab; popd ++ln -sf /proc/self/mounts /etc/mtab + + if [ "$quiet" != "1" ] ; then + echo "kernel commandline: `cat /proc/cmdline`" +@@ -470,18 +474,18 @@ echo "SUBSYSTEM==\"mmc\", RUN+=\"/sbin/modprobe mmc_block\"" >> /etc/udev/rules. + if [ "$quiet" != "1" ] ; then + echo "starting udevd" + fi +-/sbin/udevd --daemon ++ ++/lib/systemd/systemd-udevd --daemon + + if [ "$quiet" != "1" ] ; then + echo "creating devices" + fi +-/sbin/udevadm trigger ++/usr/bin/udevadm trigger + + if [ "$quiet" != "1" ] ; then + echo "waiting for system to settle" + fi +-/sbin/udevadm settle --timeout=30 || : +- ++/usr/bin/udevadm settle --timeout=30 || : + + if [ "$shell" == "1" ] ; then + echo "Shell requested on kernel commandline. Exit to continue booting." +@@ -532,7 +536,7 @@ if [ "$root" != "mtd0" -a ! -f "$thingtomount" ] ; then + # where we were unable to read the volume id. so trigger + # another run through the block devs + if [ "x$COUNTDOWN" = "x30" ]; then +- /sbin/udevadm trigger --subsystem-match=block ++ /usr/bin/udevadm trigger --subsystem-match=block + fi + done + fi +@@ -752,8 +756,6 @@ if [ -n "$EXT3FS" ] ; then + echo "setting up embedded ext3 fs " + fi + +- mkdir -p /dev/mapper +- mknod /dev/mapper/control c 10 63 + modprobe dm_snapshot + + BASE_LOOPDEV=$( losetup -f ) +@@ -775,8 +777,6 @@ if [ -e "$SQUASHED" ] ; then + echo "setting up embedded squash -> ext3 fs " + fi + +- mkdir -p /dev/mapper +- mknod /dev/mapper/control c 10 63 + modprobe dm_snapshot + + if [ "$live_ram" == "1" ] ; then +@@ -821,7 +821,7 @@ fi + if [ -x /sysroot$init ] ; then + + # Leave initramfs and transition to rootfs +- killall udevd ++ killall systemd-udevd + if [ "$quiet" != "1" ] ; then + echo "transfering control to $init" + fi +-- +1.7.10.3 + ++++++ deleted files: --- 0001-udevd-was-moved-to-lib-udev-from-sbin-in-udev-174.patch
