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

Accepting request 197948 from home:elvigia:branches:Base:System

Browse Source 
- After testing, we need to correct a major problem, /usr/bin/mount
 most be installed in /bin/mount on the initrd otherwise boot fails.

- version 032 
- add parameter --print-cmdline
- dracut now creates the initramfs without udevadm
that means the udev database does not have to populated
and the initramfs can be built in a chroot with
/sys /dev /proc mounted.
- renamed dracut_install() to inst_multiple() for consistent naming
- if $libdirs is unset, fall back to ld.so.cache paths
- always assemble /usr device in initramfs
- bash module added (disable it, if you really want dash)
- continue to boot, if the main loop times out, in systemd mode
- removed inst*() shell pure versions, dracut-install binary is in charge now
- fixed ifcfg file generation for vlan
- do not include adjtime and localtime anymore
- fixed generation of zfcp.conf of CMS setups
- install vt102 terminfo
- dracut_install() is still there for backwards compat
- do not strip files in FIPS mode
- fixed iBFT interface configuration
- fs-lib: install fsck and fsck.ext*
- shutdown: fixed killall_proc_mountpoint()
- network: also wait for ethernet interfaces to setup
- fixed checking for FIPS mode

- version 031_git201308011055
* systemd: add support for kmod static devnodes
* crypt: Wait for udev to settle before unlocking disk

OBS-URL: https://build.opensuse.org/request/show/197948
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=52
This commit is contained in:
Raymond Wooninck 2013-09-09 08:08:09 +00:00 committed by Git OBS Bridge
parent e799bf4e09
commit a6fa0f8e47
8 changed files with 97 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
dracut-030_git201307241235.tar.xz
View File

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

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

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

42
dracut.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Mon Sep 9 01:09:44 UTC 2013 - crrodriguez@opensuse.org
- After testing, we need to correct a major problem, /usr/bin/mount
most be installed in /bin/mount on the initrd otherwise boot fails.
-------------------------------------------------------------------
Mon Sep 9 00:23:56 UTC 2013 - crrodriguez@opensuse.org
- version 032
- add parameter --print-cmdline
- dracut now creates the initramfs without udevadm
that means the udev database does not have to populated
and the initramfs can be built in a chroot with
/sys /dev /proc mounted.
- renamed dracut_install() to inst_multiple() for consistent naming
- if $libdirs is unset, fall back to ld.so.cache paths
- always assemble /usr device in initramfs
- bash module added (disable it, if you really want dash)
- continue to boot, if the main loop times out, in systemd mode
- removed inst*() shell pure versions, dracut-install binary is in charge now
- fixed ifcfg file generation for vlan
- do not include adjtime and localtime anymore
- fixed generation of zfcp.conf of CMS setups
- install vt102 terminfo
- dracut_install() is still there for backwards compat
- do not strip files in FIPS mode
- fixed iBFT interface configuration
- fs-lib: install fsck and fsck.ext*
- shutdown: fixed killall_proc_mountpoint()
- network: also wait for ethernet interfaces to setup
- fixed checking for FIPS mode
-------------------------------------------------------------------
Mon Aug 5 04:30:48 UTC 2013 - crrodriguez@opensuse.org
- version 031_git201308011055
* systemd: add support for kmod static devnodes
* crypt: Wait for udev to settle before unlocking disk
* systemd/dracut-pre-trigger.service: run after systemd-tmpfiles-setup-dev
* systemd: use systemd in the initramfs, if installed on the system
-------------------------------------------------------------------
Sat Aug 3 07:10:55 UTC 2013 - tittiatcoke@gmail.com

6
dracut.spec
View File

@ -21,7 +21,7 @@
%define replace_mkinitrd 0
Name: dracut
Version: 030_git201307241235
Version: 032
Release: 0
Summary: Initramfs generator using udev
@ -74,6 +74,7 @@ Requires: util-linux >= 2.21
Requires: xz
Recommends: binutils
Requires: pigz
%{?systemd_requires}
%description
@ -282,7 +283,8 @@ rm -rf %{buildroot}
%{dracutlibdir}/modules.d/03modsign/module-setup.sh
%dir %{dracutlibdir}/modules.d/90bcache
%{dracutlibdir}/modules.d/90bcache/module-setup.sh
%dir %{dracutlibdir}/modules.d/00bash
%{dracutlibdir}/modules.d/00bash/module-setup.sh
%config(noreplace) %{_sysconfdir}/logrotate.d/dracut
%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log
%if %{defined _unitdir}

6
use_all_paths_udev.patch
View File

@ -1,6 +1,6 @@
--- dracut-030_git201307241235.orig/dracut-functions.sh
+++ dracut-030_git201307241235/dracut-functions.sh
@@ -954,7 +954,7 @@ inst_rules() {
--- dracut-031_git201308011055.orig/dracut-functions.sh
+++ dracut-031_git201308011055/dracut-functions.sh
@@ -960,7 +960,7 @@ inst_rules() {
inst_dir "$_target"
for _rule in "$@"; do
if [ "${_rule#/}" = "$_rule" ]; then

32
use_initrd_insteadof_initramfs.patch
View File

@ -1,5 +1,5 @@
--- dracut-030_git201307241235.orig/dracut.8.asc
+++ dracut-030_git201307241235/dracut.8.asc
--- dracut-031_git201308011055.orig/dracut.8.asc
+++ dracut-031_git201308011055/dracut.8.asc
@@ -18,7 +18,7 @@ DESCRIPTION
Create an initramfs <image> for the kernel with the version <kernel version>.
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
_++<kernel version>++_.
--- dracut-030_git201307241235.orig/dracut.asc
+++ dracut-030_git201307241235/dracut.asc
--- dracut-031_git201308011055.orig/dracut.asc
+++ dracut-031_git201308011055/dracut.asc
@@ -153,7 +153,7 @@ To create a initramfs image, the most si
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.
--- dracut-030_git201307241235.orig/dracut-initramfs-restore.sh
+++ dracut-030_git201307241235/dracut-initramfs-restore.sh
--- dracut-031_git201308011055.orig/dracut-initramfs-restore.sh
+++ dracut-031_git201308011055/dracut-initramfs-restore.sh
@@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)"
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@ -118,8 +118,8 @@
cd /run/initramfs
--- dracut-030_git201307241235.orig/dracut.sh
+++ dracut-030_git201307241235/dracut.sh
--- dracut-031_git201308011055.orig/dracut.sh
+++ dracut-031_git201308011055/dracut.sh
@@ -490,7 +490,7 @@ if ! [[ $outfile ]]; then
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
@ -129,8 +129,8 @@
fi
fi
--- dracut-030_git201307241235.orig/mkinitrd-dracut.sh
+++ dracut-030_git201307241235/mkinitrd-dracut.sh
--- dracut-031_git201308011055.orig/mkinitrd-dracut.sh
+++ dracut-031_git201308011055/mkinitrd-dracut.sh
@@ -11,7 +11,7 @@ usage () {
$cmd " [--nocompress]"
$cmd " <initrd-image> <kernel-version>"
@ -140,8 +140,8 @@
[[ $1 = '-n' ]] && exit 0
exit 1
--- dracut-030_git201307241235.orig/lsinitrd.1.asc
+++ dracut-030_git201307241235/lsinitrd.1.asc
--- dracut-031_git201308011055.orig/lsinitrd.1.asc
+++ dracut-031_git201308011055/lsinitrd.1.asc
@@ -18,7 +18,7 @@ DESCRIPTION
-----------
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
@ -151,8 +151,8 @@
OPTIONS
-------
--- dracut-030_git201307241235.orig/lsinitrd.sh
+++ dracut-030_git201307241235/lsinitrd.sh
--- dracut-031_git201308011055.orig/lsinitrd.sh
+++ dracut-031_git201308011055/lsinitrd.sh
@@ -84,7 +84,7 @@ else
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
@ -162,8 +162,8 @@
fi
fi
--- dracut-030_git201307241235.orig/51-dracut-rescue-postinst.sh
+++ dracut-030_git201307241235/51-dracut-rescue-postinst.sh
--- dracut-031_git201308011055.orig/51-dracut-rescue-postinst.sh
+++ dracut-031_git201308011055/51-dracut-rescue-postinst.sh
@@ -18,7 +18,7 @@ fi
[[ $MACHINE_ID ]] || exit 1
[[ -f $KERNEL_IMAGE ]] || exit 1

4
use_sysconfig_values_correctly.patch
View File

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