Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2012-11-06 16:05:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2012-09-29 15:26:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2012-11-06 16:05:13.000000000 +0100
@@ -1,0 +2,33 @@
+Mon Nov 5 08:44:30 UTC 2012 - tittiatcoke(a)gmail.com
+
+- Added additional patches to make dracut work in an openSUSE
+ environment.
+
+- Added patch (use_all_paths_udev.patch) to use both /usr/lib/udev
+ and /lib/udev as long as not all packages migrated.
+- Added patch (use_initrd_insteadof_initramfs.patch) to change
+ the naming of the generated initrd file to be more openSUSE
+- Added patch (use_sysconfig_values_correctly.patch) to read the
+ correct keymap value from /etc/sysconfig. (.gz extension)
+
+-------------------------------------------------------------------
+Thu Nov 1 17:47:45 UTC 2012 - tittiatcoke(a)gmail.com
+
+- Update to release 024:
+ + new dracut option "--device"
+ + new dracut kernel command line options "rd.auto"
+ + new dracut kernel command line options "rd.noverifyssl"
+ + new dracut option "--kernel-cmdline" and "kernel_cmdline"
+ option for default parameters
+ + fixes for systemd and crypto
+ + fix for kexec in shutdown, if not included in initramfs
+ + create the initramfs non-world readable
+ + prelink/preunlink in the initramfs
+ + strip binaries in the initramfs by default now
+ + various FIPS fixes
+ + various dracut-install fixes
+
+- Added patch (correct-paths-for-opensuse.patch) to ensure correct
+ paths for openSUSE (Plymouth)
+
+-------------------------------------------------------------------
Old:
----
dracut-023.tar.xz
initramfs-non-world-readable.patch
New:
----
correct-paths-for-opensuse.patch
dracut-024.tar.xz
use_all_paths_udev.patch
use_initrd_insteadof_initramfs.patch
use_sysconfig_values_correctly.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.HQ39hS/_old 2012-11-06 16:05:14.000000000 +0100
+++ /var/tmp/diff_new_pack.HQ39hS/_new 2012-11-06 16:05:14.000000000 +0100
@@ -21,7 +21,7 @@
%define replace_mkinitrd 0
Name: dracut
-Version: 023
+Version: 024
Release: 0
Summary: Initramfs generator using udev
@@ -35,8 +35,14 @@
# (not to be upstreamed)
Source1: module-setup-initrd.sh
Source2: parse-suse-initrd.sh
-# PATCH-FIX-UPSTREAM initramfs-non-world-readable.patch fcrozat(a)suse.com -- fix CVE-2012-4453 bnc#782734
-Patch0: initramfs-non-world-readable.patch
+# PATCH-FIX-OPENSUSE correct the paths for openSUSE - tittiatcoke(a)gmail.com
+Patch0: correct-paths-for-opensuse.patch
+# PATCH-FIX-OPENSUSE change the default naming from initramfs to initrd - tittiatcoke(a)gmail.com
+Patch1: use_initrd_insteadof_initramfs.patch
+# PATCH-FIX-OPENSUSE Strip the gz extension from the keymap mentioned in /etc/sysconfig/keyboard - tittiatcoke(a)gmail.com
+Patch2: use_sysconfig_values_correctly.patch
+# PATCH-FIX-OPENSUSE At the moment we have 2 paths that contain udev files (/lib/udev and /usr/lib/udev) - tittiatcoke(a)gmail.com
+Patch3: use_all_paths_udev.patch
BuildRequires: bash
BuildRequires: dash
@@ -107,6 +113,9 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
make all -e CFLAGS="%{optflags}"
++++++ correct-paths-for-opensuse.patch ++++++
--- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/10i18n/module-setup.sh 2012-11-01 19:52:37.196044993 +0100
@@ -86,6 +86,8 @@
install_base() {
dracut_install setfont loadkeys kbd_mode stty
+ inst /usr/bin/setfont /bin/setfont
+ inst /usr/bin/loadkeys /bin/loadkeys
inst ${moddir}/console_init.sh /lib/udev/console_init
inst_rules ${moddir}/10-console.rules
inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
--- dracut-024/modules.d/50plymouth/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/module-setup.sh 2012-11-01 19:52:37.196044993 +0100
@@ -4,7 +4,7 @@
check() {
[[ "$mount_needs" ]] && return 1
- [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
+ [[ -x /usr/sbin/plymouthd && -x /usr/bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
}
depends() {
@@ -64,12 +64,12 @@
}
install() {
- if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
- || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+ if grep -q nash /usr/lib/plymouth/plymouth-populate-initrd \
+ || [ ! -x /usr/lib/plymouth/plymouth-populate-initrd ]; then
. "$moddir"/plymouth-populate-initrd.sh
else
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
- /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+ /usr/lib/plymouth/plymouth-populate-initrd -t $initdir
fi
inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
--- dracut-024/modules.d/50plymouth/plymouth-emergency.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-emergency.sh 2012-11-01 19:52:37.196044993 +0100
@@ -1,4 +1,4 @@
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+[ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
--- dracut-024/modules.d/50plymouth/plymouth-newroot.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-newroot.sh 2012-11-01 19:52:37.196044993 +0100
@@ -2,6 +2,6 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
- /bin/plymouth --newroot=$NEWROOT
+if [ -x /usr/bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
+ /usr/bin/plymouth --newroot=$NEWROOT
fi
--- dracut-024/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-populate-initrd.sh 2012-11-01 19:52:37.196044993 +0100
@@ -4,8 +4,8 @@
PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
PLYMOUTH_THEME=$(plymouth-set-default-theme)
-inst /sbin/plymouthd /bin/plymouthd
-dracut_install /bin/plymouth \
+inst /usr/sbin/plymouthd /usr/sbin/plymouthd
+dracut_install /usr/bin/plymouth \
"${PLYMOUTH_LOGO_FILE}" \
/etc/system-release
--- dracut-024/modules.d/50plymouth/plymouth-pretrigger.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/50plymouth/plymouth-pretrigger.sh 2012-11-01 19:52:37.196044993 +0100
@@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
-if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
+if [ -x /usr/sbin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem
udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
@@ -16,8 +16,8 @@
read consoledev rest < /sys/class/tty/console/active
consoledev=${consoledev:-tty0}
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
- [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
- /bin/plymouth --show-splash 2>&1 | vinfo
+ [ -x /usr/sbin/plymouthd ] && /usr/sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+ /usr/bin/plymouth --show-splash 2>&1 | vinfo
# reset tty after plymouth messed with it
[ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
fi
--- dracut-024/modules.d/95udev-rules/module-setup.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/95udev-rules/module-setup.sh 2012-11-01 19:53:58.859048946 +0100
@@ -11,6 +11,8 @@
dracut_install udevadm cat uname blkid \
/etc/udev/udev.conf
+ inst /usr/sbin/blkid /sbin/blkid
+
[ -d ${initdir}/lib/systemd ] || mkdir -p ${initdir}/lib/systemd
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /lib/systemd/systemd-udevd /sbin/udevd; do
[ -x "$_i" ] || continue
--- a/dracut.sh
+++ b/dracut.sh
@@ -561,7 +561,7 @@
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $compress_l ]] && compress=$compress_l
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -69,7 +69,7 @@
}
install() {
- dracut_install -o /lib/modprobe.d/*.conf
+ dracut_install -o /etc/modprobe.d/*.conf
[[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
--- dracut-024/modules.d/90crypt/crypt-lib.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/90crypt/crypt-lib.sh 2012-11-02 23:39:56.702130681 +0100
@@ -47,8 +47,8 @@
{ flock -s 9;
# Prompt for password with plymouth, if installed and running.
- if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
- /bin/plymouth ask-for-password \
+ if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping; then
+ /usr/bin/plymouth ask-for-password \
--prompt "$ply_prompt" --number-of-tries=$ply_tries \
--command="$ply_cmd"
ret=$?
--- dracut-024/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/90dmsquash-live/dmsquash-live-root.sh 2012-11-02 23:40:31.807132380 +0100
@@ -31,13 +31,13 @@
fi
getarg rd.live.check -d check || check=""
if [ -n "$check" ]; then
- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
checkisomd5 --verbose $livedev
if [ $? -ne 0 ]; then
die "CD check failed!"
exit 1
fi
- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
+ [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash
fi
ln -s $livedev /run/initramfs/livedev
--- dracut-024/modules.d/98systemd/dracut-emergency.service 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/98systemd/dracut-emergency.service 2012-11-02 23:41:13.214134384 +0100
@@ -14,7 +14,7 @@
[Service]
Environment=HOME=/
WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
ExecStartPre=-/bin/echo -e '\n\nEntering emergency mode. Exit the shell to continue.\nType "journalctl" to view system logs.\n'
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f /.console_lock
--- dracut-024/modules.d/98systemd/rescue.service 2012-10-16 16:31:06.000000000 +0200
+++ new/modules.d/98systemd/rescue.service 2012-11-02 23:42:36.401138410 +0100
@@ -14,7 +14,7 @@
[Service]
Environment=HOME=/
WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default
++++++ use_all_paths_udev.patch ++++++
diff -urB dracut-024/dracut-functions.sh new/dracut-functions.sh
--- dracut-024/dracut-functions.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/dracut-functions.sh 2012-11-04 00:20:30.736648962 +0100
@@ -901,7 +901,7 @@
inst_dir "$_target"
for _rule in "$@"; do
if [ "${rule#/}" = "$rule" ]; then
- for r in ${udevdir}/rules.d /etc/udev/rules.d; do
+ for r in ${udevdir}/rules.d lib/udev/rules.d /etc/udev/rules.d; do
if [[ -f $r/$_rule ]]; then
_found="$r/$_rule"
inst_rule_programs "$_found"
++++++ use_initrd_insteadof_initramfs.patch ++++++
diff -urB dracut-024/dracut.8.asc new/dracut.8.asc
--- dracut-024/dracut.8.asc 2012-10-16 16:31:06.000000000 +0200
+++ new/dracut.8.asc 2012-11-02 14:34:30.037441264 +0100
@@ -18,7 +18,7 @@
Create an initramfs <image> for the kernel with the version <kernel version>.
If <kernel version> is omitted, then the version of the actual running
kernel is used. If <image> is omitted or empty, then the default location
-/boot/initramfs-<kernel version>.img is used.
+/boot/initrd-<kernel version> is used.
dracut creates an initial image used by the kernel for preloading the block
device modules (such as IDE, SCSI or RAID) which are needed to access the root
@@ -40,7 +40,7 @@
This will generate a general purpose initramfs image, with all possible
functionality resulting of the combination of the installed dracut modules and
-system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
+system tools. The image is /boot/initrd-_++<kernel version>++_ and
contains the kernel modules of the currently active kernel with version
_++<kernel version>++_.
diff -urB dracut-024/dracut.asc new/dracut.asc
--- dracut-024/dracut.asc 2012-10-16 16:31:06.000000000 +0200
+++ new/dracut.asc 2012-11-02 14:35:49.947445131 +0100
@@ -130,7 +130,7 @@
This will generate a general purpose initramfs image, with all possible
functionality resulting of the combination of the installed dracut modules and
-system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
+system tools. The image is /boot/initrd-_++<kernel version>++_ and
contains the kernel modules of the currently active kernel with version
_++<kernel version>++_.
@@ -170,12 +170,12 @@
=== Inspecting the Contents
To see the contents of the image created by dracut, you can use the lsinitrd tool.
----
-# lsinitrd /boot/initramfs-$(uname -r).img | less
+# lsinitrd /boot/initrd-$(uname -r) | less
----
To display the contents of a file in the initramfs also use the lsinitrd tool:
----
-# lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf
+# lsinitrd /boot/initrd-$(uname -r) /etc/ld.so.conf
include ld.so.conf.d/*.conf
----
@@ -186,7 +186,7 @@
You can also add dracut modules on the command line
by using the -a or --add option:
----
-# dracut --add bootchart initramfs-bootchart.img
+# dracut --add bootchart initrd-bootchart
----
To see a list of available dracut modules, use the --list-modules option:
@@ -215,7 +215,7 @@
on the command line or the drivers vaiable in the _/etc/dracut.conf_
or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <<dracutconf5>>):
----
-# dracut --add-drivers mymod initramfs-with-mymod.img
+# dracut --add-drivers mymod initrd-with-mymod
----
== Boot parameters
@@ -328,7 +328,7 @@
The --include option let you specify a source path and a target path. For example
----
-# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
+# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initrd-cmdline-pre.img
----
will create an initramfs image, where the file cmdline-preset will be copied
inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once.
@@ -350,7 +350,7 @@
└── conf.d
└── testvar.conf
-# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
+# dracut --include rd.live.overlay / initrd-rd.live.overlay.img
----
This will put the contents of the rd.live.overlay directory into the root of the
@@ -362,7 +362,7 @@
----
-# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
+# dracut --install 'strace fsck.ext3 ssh' initrd-dbg
----
This will create an initramfs with the strace, fsck.ext3 and ssh executables,
@@ -414,7 +414,7 @@
----
-# dracut -m "nfs network base" initramfs-nfs-only.img
+# dracut -m "nfs network base" initrd-nfs-only
----
Then you would boot from this image with your target machine and reduce the size
@@ -422,7 +422,7 @@
----
-# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
+# dracut -m "nfs network base" --host-only initrd-nfs-host-only
----
This will reduce the size of the initramfs image significantly.
diff -urB dracut-024/dracut-initramfs-restore.sh new/dracut-initramfs-restore.sh
--- dracut-024/dracut-initramfs-restore.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/dracut-initramfs-restore.sh 2012-11-02 14:34:30.036441264 +0100
@@ -4,7 +4,7 @@
set -e
cd /run/initramfs
-IMG="/boot/initramfs-$(uname -r).img"
+IMG="/boot/initrd-$(uname -r)"
[ -f .need_shutdown -a -f "$IMG" ] || exit 1
if zcat "$IMG" | cpio -id >/dev/null 2>&1; then
rm .need_shutdown
diff -urB dracut-024/dracut.sh new/dracut.sh
--- dracut-024/dracut.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/dracut.sh 2012-11-02 14:34:30.038441264 +0100
@@ -417,7 +417,7 @@
fi
if ! [[ $outfile ]]; then
- outfile="/boot/initramfs-$kernel.img"
+ outfile="/boot/initrd-$kernel"
fi
for i in /usr/sbin /sbin /usr/bin /bin; do
diff -urB dracut-024/lsinitrd.1.asc new/lsinitrd.1.asc
--- dracut-024/lsinitrd.1.asc 2012-10-16 16:31:06.000000000 +0200
+++ new/lsinitrd.1.asc 2012-11-02 14:34:30.039441264 +0100
@@ -15,7 +15,7 @@
DESCRIPTION
-----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
-lsinitrd uses the default image /boot/initramfs-<kernel version>.img.
+lsinitrd uses the default image /boot/initrd-<kernel version>.
OPTIONS
-------
diff -urB dracut-024/lsinitrd.sh new/lsinitrd.sh
--- dracut-024/lsinitrd.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/lsinitrd.sh 2012-11-02 14:34:30.039441264 +0100
@@ -36,7 +36,7 @@
done
shift $((OPTIND-1))
-image="${1:-/boot/initramfs-$(uname -r).img}"
+image="${1:-/boot/initrd-$(uname -r)}"
[[ -f "$image" ]] || { echo "$image does not exist" ; exit 1 ; }
CAT=zcat
diff -urB dracut-024/mkinitrd-dracut.sh new/mkinitrd-dracut.sh
--- dracut-024/mkinitrd-dracut.sh 2012-10-16 16:31:06.000000000 +0200
+++ new/mkinitrd-dracut.sh 2012-11-02 14:34:30.039441264 +0100
@@ -11,7 +11,7 @@
$cmd " [--nocompress]"
$cmd " <initrd-image> <kernel-version>"
$cmd ""
- $cmd " (ex: ${0##*/} /boot/initramfs-$kver.img $kver)"
+ $cmd " (ex: ${0##*/} /boot/initrd-$kver $kver)"
[[ $1 = '-n' ]] && exit 0
exit 1
++++++ use_sysconfig_values_correctly.patch ++++++
diff -urB new/modules.d/10i18n/module-setup.sh new1/modules.d/10i18n/module-setup.sh
--- new/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:30.082452541 +0100
+++ new1/modules.d/10i18n/module-setup.sh 2012-11-02 19:50:49.884453499 +0100
@@ -144,6 +144,9 @@
# Gentoo user may have KEYMAP set to something like "-u pl2",
KEYMAP=${KEYMAP#-* }
+ # openSUSE user may have KEYMAP set to something like ".gz"
+ KEYMAP=${KEYMAP/.gz/}
+
# KEYTABLE is a bit special - it defines base keymap name and UNICODE
# determines whether non-UNICODE or UNICODE version is used
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
