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

Accepting request 129591 from home:fcrozat:branches:Base:System

Browse Source 
- Update to release 023:
  + resume from hibernate fixes
  + -N option for --no-hostonly
  + support for systemd crypto handling
  + new dracut module "crypt-loop"
  + deprecate the old kernel command line options
  + more documentation
  + honor CFLAGS for dracut-install build
  + multipath fixes
  + / is mounted according to rootflags parameter but forced ro at
    first. Later it is remounted according to /etc/fstab +
    rootflags parameter and "ro"/"rw".
  + support for xfs / reiserfs separate journal device
  + new "ro_mnt" option to force ro mount of / and /usr
  + root on cifs support
  + dracut-install: fixed issue for /var/tmp containing a symlink
  + only lazy resolve with ldd, if the /var/tmp partition is not
    mounted with "noexec".
  + i18n: fixed inclusion of "include" keymaps
- Drop dracut_makefile_cflags_pass.patch and separate-journal.patch
  (merged upstream)

OBS-URL: https://build.opensuse.org/request/show/129591
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=3
This commit is contained in:
Robert Milasan 2012-08-02 19:33:14 +00:00 committed by Git OBS Bridge
parent 5b07b8f022
commit f4ff927d08
6 changed files with 39 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dracut-022.tar.xz
View File

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

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

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

25
dracut.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Aug 1 13:39:16 UTC 2012 - fcrozat@suse.com
- Update to release 023:
+ resume from hibernate fixes
+ -N option for --no-hostonly
+ support for systemd crypto handling
+ new dracut module "crypt-loop"
+ deprecate the old kernel command line options
+ more documentation
+ honor CFLAGS for dracut-install build
+ multipath fixes
+ / is mounted according to rootflags parameter but forced ro at
first. Later it is remounted according to /etc/fstab +
rootflags parameter and "ro"/"rw".
+ support for xfs / reiserfs separate journal device
+ new "ro_mnt" option to force ro mount of / and /usr
+ root on cifs support
+ dracut-install: fixed issue for /var/tmp containing a symlink
+ only lazy resolve with ldd, if the /var/tmp partition is not
mounted with "noexec".
+ i18n: fixed inclusion of "include" keymaps
- Drop dracut_makefile_cflags_pass.patch and separate-journal.patch
(merged upstream)
-------------------------------------------------------------------
Mon Jul 23 15:37:59 UTC 2012 - fcrozat@suse.com

17
dracut.spec
View File

@ -15,7 +15,7 @@
%define replace_mkinitrd 0
Name: dracut
Version: 022
Version: 023
Release: 0
Summary: Initramfs generator using udev
@ -29,9 +29,6 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{versi
# (not to be upstreamed)
Source1: module-setup-initrd.sh
Source2: parse-suse-initrd.sh
# PATCH-FIX-UPSTREAM dracut_makefile_cflags_pass.patch
Patch0: dracut_makefile_cflags_pass.patch
Patch1: separate-journal.patch
BuildRequires: bash
BuildRequires: dash
@ -98,8 +95,6 @@ This package contains tools to assemble the local initrd and host configuration.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
make all -e CFLAGS="%{optflags}"
@ -186,6 +181,14 @@ rm -rf %{buildroot}
%endif
%{_mandir}/man7/dracut.kernel.7*
%{_mandir}/man7/dracut.cmdline.7*
%{_mandir}/man8/dracut-cmdline.service.8*
%{_mandir}/man8/dracut-initqueue.service.8*
%{_mandir}/man8/dracut-initqueue.service.8*
%{_mandir}/man8/dracut-pre-pivot.service.8*
%{_mandir}/man8/dracut-pre-trigger.service.8*
%{_mandir}/man8/dracut-pre-udev.service.8*
%{_mandir}/man8/initrd-switch-root.service.8*
%{_mandir}/man8/udevadm-cleanup-db.service.8*
%{_mandir}/man5/dracut.conf.5*
%{dracutlibdir}/modules.d/00bootchart
%{dracutlibdir}/modules.d/00dash
@ -207,6 +210,8 @@ rm -rf %{buildroot}
%{dracutlibdir}/modules.d/90multipath
%{dracutlibdir}/modules.d/90qemu
%{dracutlibdir}/modules.d/91crypt-gpg
%{dracutlibdir}/modules.d/91crypt-loop
%{dracutlibdir}/modules.d/95cifs
%{dracutlibdir}/modules.d/95debug
%{dracutlibdir}/modules.d/95resume
%{dracutlibdir}/modules.d/95rootfs-block

29
dracut_makefile_cflags_pass.patch
View File

@ -1,29 +0,0 @@
dracut: Make compiler flags configurable via make -e CFLAGS
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
install/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: dracut-022/Makefile
===================================================================
--- dracut-022.orig/Makefile
+++ dracut-022/Makefile
@@ -8,6 +8,7 @@ pkglibdir ?= ${libdir}/dracut
sysconfdir ?= ${prefix}/etc
bindir ?= ${prefix}/bin
mandir ?= ${prefix}/share/man
+CFLAGS ?= -std=gnu99 -O2 -g -Wall
manpages = dracut.8 \
dracut.cmdline.7 \
@@ -33,7 +34,7 @@ DRACUT_INSTALL_HEADER = \
install/util.h
dracut-install: $(DRACUT_INSTALL_SOURCE) $(DRACUT_INSTALL_HEADER)
- gcc -std=gnu99 -O2 -g -Wall -o dracut-install $(DRACUT_INSTALL_SOURCE)
+ gcc $(CFLAGS) -o dracut-install $(DRACUT_INSTALL_SOURCE)
indent:
indent -i8 -nut -br -linux -l120 install/dracut-install.c

93
separate-journal.patch
View File

@ -1,93 +0,0 @@
From a7c592b9bb7de0d7874ae51d02944a7eee2ec75b Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Tue, 24 Jul 2012 18:52:17 +0200
Subject: [PATCH] Add support for separate journal on reiserfs and xfs
---
modules.d/95rootfs-block/module-setup.sh | 43 ++++++++++++++++++++++++++++++
modules.d/95rootfs-block/mount-root.sh | 15 +++++++++++
2 files changed, 58 insertions(+)
diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh
index 243a174..e5212c7 100755
--- a/modules.d/95rootfs-block/module-setup.sh
+++ b/modules.d/95rootfs-block/module-setup.sh
@@ -2,6 +2,49 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
+type det_fs >/dev/null 2>&1 || . $dracutbasedir/modules.d/99fs-lib/fs-lib.sh
+
+search_option() {
+ rootopts=$1
+ option=$2
+ local OLDIFS="$IFS"
+ IFS=,
+ set -- $rootopts
+ IFS="$OLDIFS"
+ while [ $# -gt 0 ]; do
+ case $1 in
+ $option=*)
+ echo ${1#${option}=}
+ break
+ esac
+ shift
+ done
+}
+
+check() {
+ rootopts="defaults"
+ while read dev mp fs opts dump fsck; do
+ # skip comments
+ [ "${dev%%#*}" != "$dev" ] && continue
+
+ if [ "$mp" = "/" ]; then
+ # sanity - determine/fix fstype
+ rootfs=$(det_fs "${root#block:}" "$fs")
+ rootopts=$opts
+ rootfsck=$fsck
+ break
+ fi
+ done < "$NEWROOT/etc/fstab"
+
+ [ "$rootfs" = "reiserfs" ] && journaldev=$(search_option $rootopts "jdev")
+ [ "$rootfs" = "xfs" ] && journaldev=$(search_option $rootopts "logdev")
+ if [ -n "$journaldev" ]; then
+ echo "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-journaldev.conf"
+ fi
+ return 0
+
+}
+
depends() {
echo fs-lib
}
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index e61b0e8..d4300ae 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -29,6 +29,21 @@ mount_root() {
local _ret
# sanity - determine/fix fstype
rootfs=$(det_fs "${root#block:}" "$fstype")
+
+ journaldev=$(getarg root.journaldev)
+ if [ -n $journaldev ]; then
+ case "$rootfs" in
+ xfs)
+ rflags="${rflags:+${rflags},}logdev=$journaldev"
+ ;;
+ reiserfs)
+ fsckoptions="-j $journaldev $fsckoptions"
+ rflags="${rflags:+${rflags},}jdev=$journaldev"
+ ;;
+ *);;
+ esac
+ fi
+
while ! mount -t ${rootfs} -o "$rflags",ro "${root#block:}" "$NEWROOT"; do
warn "Failed to mount -t ${rootfs} -o $rflags,ro ${root#block:} $NEWROOT"
fsck_ask_err
--
1.7.10.4