pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 200075 from Base:System

Browse Source 
- save a few seconds on boot by always including the autofs4 
  kernel module in the initrd

- dracut 033 
- improved hostonly device recognition
- improved hostonly module recognition
- do not install udev rules from /etc in generic mode
- fixed LABEL= parsing for swap devices
- fixed iBFT network setup
- removed caching of kernel cmdline
- bcache: support new blkid
- ifup with dhcp, if no "ip=" specified for the interface
- fixed ifup udev rules (forwarded request 200059 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/200075
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=20
This commit is contained in:
Stephan Kulow 2013-09-23 06:52:02 +00:00 committed by Git OBS Bridge
commit 3d386486f9
8 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
correct-paths-for-opensuse.patch
View File

@ -1,5 +1,5 @@
--- dracut-032.orig/dracut.sh --- dracut-033.orig/dracut.sh
+++ dracut-032/dracut.sh +++ dracut-033/dracut.sh
@@ -661,7 +661,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l @@ -661,7 +661,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
@ -9,9 +9,9 @@
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp [[ $tmpdir ]] || tmpdir=/var/tmp
[[ $compress_l ]] && compress=$compress_l [[ $compress_l ]] && compress=$compress_l
--- dracut-032.orig/modules.d/10i18n/module-setup.sh --- dracut-033.orig/modules.d/10i18n/module-setup.sh
+++ dracut-032/modules.d/10i18n/module-setup.sh +++ dracut-033/modules.d/10i18n/module-setup.sh
@@ -94,6 +94,8 @@ install() { @@ -99,6 +99,8 @@ install() {
install_base() { install_base() {
inst_multiple setfont loadkeys kbd_mode stty inst_multiple setfont loadkeys kbd_mode stty
@ -20,8 +20,8 @@
if ! dracut_module_included "systemd"; then if ! dracut_module_included "systemd"; then
inst ${moddir}/console_init.sh /lib/udev/console_init inst ${moddir}/console_init.sh /lib/udev/console_init
--- dracut-032.orig/modules.d/50plymouth/module-setup.sh --- dracut-033.orig/modules.d/50plymouth/module-setup.sh
+++ dracut-032/modules.d/50plymouth/module-setup.sh +++ dracut-033/modules.d/50plymouth/module-setup.sh
@@ -12,12 +12,12 @@ depends() { @@ -12,12 +12,12 @@ depends() {
} }
@ -38,8 +38,8 @@
fi fi
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
--- dracut-032.orig/modules.d/90kernel-modules/module-setup.sh --- dracut-033.orig/modules.d/90kernel-modules/module-setup.sh
+++ dracut-032/modules.d/90kernel-modules/module-setup.sh +++ dracut-033/modules.d/90kernel-modules/module-setup.sh
@@ -74,7 +74,7 @@ installkernel() { @@ -74,7 +74,7 @@ installkernel() {
} }
@ -49,8 +49,8 @@
[[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf [[ $hostonly ]] && inst_multiple -o /etc/modprobe.d/*.conf /etc/modprobe.conf
if ! dracut_module_included "systemd"; then if ! dracut_module_included "systemd"; then
inst_hook cmdline 01 "$moddir/parse-kernel.sh" inst_hook cmdline 01 "$moddir/parse-kernel.sh"
--- dracut-032.orig/modules.d/95udev-rules/module-setup.sh --- dracut-033.orig/modules.d/95udev-rules/module-setup.sh
+++ dracut-032/modules.d/95udev-rules/module-setup.sh +++ dracut-033/modules.d/95udev-rules/module-setup.sh
@@ -11,6 +11,8 @@ install() { @@ -11,6 +11,8 @@ install() {
inst_multiple udevadm cat uname blkid \ inst_multiple udevadm cat uname blkid \
/etc/udev/udev.conf /etc/udev/udev.conf
@ -60,8 +60,8 @@
[ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
[ -x "$_i" ] || continue [ -x "$_i" ] || continue
--- dracut-032.orig/modules.d/98systemd/rescue.service --- dracut-033.orig/modules.d/98systemd/rescue.service
+++ dracut-032/modules.d/98systemd/rescue.service +++ dracut-033/modules.d/98systemd/rescue.service
@@ -16,7 +16,7 @@ Environment=HOME=/ @@ -16,7 +16,7 @@ Environment=HOME=/
Environment=DRACUT_SYSTEMD=1 Environment=DRACUT_SYSTEMD=1
Environment=NEWROOT=/sysroot Environment=NEWROOT=/sysroot
@ -71,8 +71,8 @@
ExecStart=-/bin/sh -i -l ExecStart=-/bin/sh -i -l
ExecStopPost=-/bin/rm -f -- /.console_lock ExecStopPost=-/bin/rm -f -- /.console_lock
ExecStopPost=-/usr/bin/systemctl --fail --no-block default ExecStopPost=-/usr/bin/systemctl --fail --no-block default
--- dracut-032.orig/modules.d/99fs-lib/module-setup.sh --- dracut-033.orig/modules.d/99fs-lib/module-setup.sh
+++ dracut-032/modules.d/99fs-lib/module-setup.sh +++ dracut-033/modules.d/99fs-lib/module-setup.sh
@@ -81,4 +81,5 @@ install() { @@ -81,4 +81,5 @@ install() {
fi fi

3
dracut-032.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8674b6de28afdec276742cb1f25371f0431b42135d6b6cb00cecb709c53a7402
size 231624

3
dracut-033.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca2c1fa21efe9e11181b69fa915a1f6cb0b92ff92a9b4981052bd7ad07b83423
size 237200

20
dracut.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sat Sep 21 17:36:13 UTC 2013 - crrodriguez@opensuse.org
- save a few seconds on boot by always including the autofs4
kernel module in the initrd
-------------------------------------------------------------------
Sat Sep 21 17:31:15 UTC 2013 - crrodriguez@opensuse.org
- dracut 033
- improved hostonly device recognition
- improved hostonly module recognition
- do not install udev rules from /etc in generic mode
- fixed LABEL= parsing for swap devices
- fixed iBFT network setup
- removed caching of kernel cmdline
- bcache: support new blkid
- ifup with dhcp, if no "ip=" specified for the interface
- fixed ifup udev rules
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 9 01:09:44 UTC 2013 - crrodriguez@opensuse.org Mon Sep 9 01:09:44 UTC 2013 - crrodriguez@opensuse.org

4
dracut.spec
View File

@ -21,7 +21,7 @@
%define replace_mkinitrd 0 %define replace_mkinitrd 0
Name: dracut Name: dracut
Version: 032 Version: 033
Release: 0 Release: 0
Summary: Initramfs generator using udev Summary: Initramfs generator using udev
@ -161,6 +161,8 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log
#mkdir -p %{buildroot}%{_localstatedir}/initramfs #mkdir -p %{buildroot}%{_localstatedir}/initramfs
install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
echo 'add_drivers+="autofs4"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf
%endif %endif

12
use_all_paths_udev.patch
View File

@ -1,11 +1,11 @@
--- dracut-031_git201308011055.orig/dracut-functions.sh --- dracut-033.orig/dracut-functions.sh
+++ dracut-031_git201308011055/dracut-functions.sh +++ dracut-033/dracut-functions.sh
@@ -960,7 +960,7 @@ inst_rules() { @@ -872,7 +872,7 @@ inst_rules() {
inst_dir "$_target" inst_dir "$_target"
for _rule in "$@"; do for _rule in "$@"; do
if [ "${_rule#/}" = "$_rule" ]; then if [ "${_rule#/}" = "$_rule" ]; then
- for r in ${udevdir}/rules.d /etc/udev/rules.d; do - for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
+ for r in ${udevdir}/rules.d lib/udev/rules.d /etc/udev/rules.d; do + for r in ${udevdir}/rules.d lib/udev/rules.d ${hostonly:+/etc/udev/rules.d}; do
if [[ -f $r/$_rule ]]; then if [[ -e $r/$_rule ]]; then
_found="$r/$_rule" _found="$r/$_rule"
inst_rule_programs "$_found" inst_rule_programs "$_found"

34
use_initrd_insteadof_initramfs.patch
View File

@ -1,5 +1,5 @@
--- dracut-031_git201308011055.orig/dracut.8.asc --- dracut-033.orig/dracut.8.asc
+++ dracut-031_git201308011055/dracut.8.asc +++ dracut-033/dracut.8.asc
@@ -18,7 +18,7 @@ DESCRIPTION @@ -18,7 +18,7 @@ DESCRIPTION
Create an initramfs <image> for the kernel with the version <kernel version>. Create an initramfs <image> for the kernel with the version <kernel version>.
If <kernel version> is omitted, then the version of the actual running If <kernel version> is omitted, then the version of the actual running
@ -18,8 +18,8 @@
contains the kernel modules of the currently active kernel with version contains the kernel modules of the currently active kernel with version
_++<kernel version>++_. _++<kernel version>++_.
--- dracut-031_git201308011055.orig/dracut.asc --- dracut-033.orig/dracut.asc
+++ dracut-031_git201308011055/dracut.asc +++ dracut-033/dracut.asc
@@ -153,7 +153,7 @@ To create a initramfs image, the most si @@ -153,7 +153,7 @@ To create a initramfs image, the most si
This will generate a general purpose initramfs image, with all possible This will generate a general purpose initramfs image, with all possible
@ -107,8 +107,8 @@
---- ----
This will reduce the size of the initramfs image significantly. This will reduce the size of the initramfs image significantly.
--- dracut-031_git201308011055.orig/dracut-initramfs-restore.sh --- dracut-033.orig/dracut-initramfs-restore.sh
+++ dracut-031_git201308011055/dracut-initramfs-restore.sh +++ dracut-033/dracut-initramfs-restore.sh
@@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)" @@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)"
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@ -118,9 +118,9 @@
cd /run/initramfs cd /run/initramfs
--- dracut-031_git201308011055.orig/dracut.sh --- dracut-033.orig/dracut.sh
+++ dracut-031_git201308011055/dracut.sh +++ dracut-033/dracut.sh
@@ -490,7 +490,7 @@ if ! [[ $outfile ]]; then @@ -507,7 +507,7 @@ if ! [[ $outfile ]]; then
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
outfile="/boot/${MACHINE_ID}/$kernel/initrd" outfile="/boot/${MACHINE_ID}/$kernel/initrd"
else else
@ -129,8 +129,8 @@
fi fi
fi fi
--- dracut-031_git201308011055.orig/mkinitrd-dracut.sh --- dracut-033.orig/mkinitrd-dracut.sh
+++ dracut-031_git201308011055/mkinitrd-dracut.sh +++ dracut-033/mkinitrd-dracut.sh
@@ -11,7 +11,7 @@ usage () { @@ -11,7 +11,7 @@ usage () {
$cmd " [--nocompress]" $cmd " [--nocompress]"
$cmd " <initrd-image> <kernel-version>" $cmd " <initrd-image> <kernel-version>"
@ -140,8 +140,8 @@
[[ $1 = '-n' ]] && exit 0 [[ $1 = '-n' ]] && exit 0
exit 1 exit 1
--- dracut-031_git201308011055.orig/lsinitrd.1.asc --- dracut-033.orig/lsinitrd.1.asc
+++ dracut-031_git201308011055/lsinitrd.1.asc +++ dracut-033/lsinitrd.1.asc
@@ -18,7 +18,7 @@ DESCRIPTION @@ -18,7 +18,7 @@ DESCRIPTION
----------- -----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
@ -151,8 +151,8 @@
OPTIONS OPTIONS
------- -------
--- dracut-031_git201308011055.orig/lsinitrd.sh --- dracut-033.orig/lsinitrd.sh
+++ dracut-031_git201308011055/lsinitrd.sh +++ dracut-033/lsinitrd.sh
@@ -84,7 +84,7 @@ else @@ -84,7 +84,7 @@ else
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@ -162,8 +162,8 @@
fi fi
fi fi
--- dracut-031_git201308011055.orig/51-dracut-rescue-postinst.sh --- dracut-033.orig/51-dracut-rescue-postinst.sh
+++ dracut-031_git201308011055/51-dracut-rescue-postinst.sh +++ dracut-033/51-dracut-rescue-postinst.sh
@@ -18,7 +18,7 @@ fi @@ -18,7 +18,7 @@ fi
[[ $MACHINE_ID ]] || exit 1 [[ $MACHINE_ID ]] || exit 1
[[ -f $KERNEL_IMAGE ]] || exit 1 [[ -f $KERNEL_IMAGE ]] || exit 1

6
use_sysconfig_values_correctly.patch
View File

@ -1,6 +1,6 @@
--- dracut-031_git201308011055.orig/modules.d/10i18n/module-setup.sh --- dracut-033.orig/modules.d/10i18n/module-setup.sh
+++ dracut-031_git201308011055/modules.d/10i18n/module-setup.sh +++ dracut-033/modules.d/10i18n/module-setup.sh
@@ -155,6 +155,9 @@ install() { @@ -160,6 +160,9 @@ install() {
# Gentoo user may have KEYMAP set to something like "-u pl2", # Gentoo user may have KEYMAP set to something like "-u pl2",
KEYMAP=${KEYMAP#-* } KEYMAP=${KEYMAP#-* }