Accepting request 177972 from Base:System
- version 027_git201306061213 * setup correct system time and time zone in initrd * systemd integration bugfixes * lvm bugfixes. (forwarded request 177940 from elvigia) OBS-URL: https://build.opensuse.org/request/show/177972 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=13
This commit is contained in:
commit
b2903b01ab
@ -1,7 +1,5 @@
|
||||
Index: dracut-027_git201304121327/dracut.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/dracut.sh
|
||||
+++ dracut-027_git201304121327/dracut.sh
|
||||
--- dracut-027_git201305310800.orig/dracut.sh
|
||||
+++ dracut-027_git201305310800/dracut.sh
|
||||
@@ -627,7 +627,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
|
||||
[[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
|
||||
[[ $lvmconf_l ]] && lvmconf=$lvmconf_l
|
||||
@ -11,10 +9,8 @@ Index: dracut-027_git201304121327/dracut.sh
|
||||
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
|
||||
[[ $tmpdir ]] || tmpdir=/var/tmp
|
||||
[[ $compress_l ]] && compress=$compress_l
|
||||
Index: dracut-027_git201304121327/modules.d/10i18n/module-setup.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/modules.d/10i18n/module-setup.sh
|
||||
+++ dracut-027_git201304121327/modules.d/10i18n/module-setup.sh
|
||||
--- dracut-027_git201305310800.orig/modules.d/10i18n/module-setup.sh
|
||||
+++ dracut-027_git201305310800/modules.d/10i18n/module-setup.sh
|
||||
@@ -85,6 +85,8 @@ install() {
|
||||
|
||||
install_base() {
|
||||
@ -24,10 +20,8 @@ Index: dracut-027_git201304121327/modules.d/10i18n/module-setup.sh
|
||||
|
||||
if ! dracut_module_included "systemd"; then
|
||||
inst ${moddir}/console_init.sh /lib/udev/console_init
|
||||
Index: dracut-027_git201304121327/modules.d/50plymouth/module-setup.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/modules.d/50plymouth/module-setup.sh
|
||||
+++ dracut-027_git201304121327/modules.d/50plymouth/module-setup.sh
|
||||
--- dracut-027_git201305310800.orig/modules.d/50plymouth/module-setup.sh
|
||||
+++ dracut-027_git201305310800/modules.d/50plymouth/module-setup.sh
|
||||
@@ -12,12 +12,12 @@ depends() {
|
||||
}
|
||||
|
||||
@ -44,10 +38,8 @@ Index: dracut-027_git201304121327/modules.d/50plymouth/module-setup.sh
|
||||
fi
|
||||
|
||||
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
|
||||
Index: dracut-027_git201304121327/modules.d/90kernel-modules/module-setup.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/modules.d/90kernel-modules/module-setup.sh
|
||||
+++ dracut-027_git201304121327/modules.d/90kernel-modules/module-setup.sh
|
||||
--- dracut-027_git201305310800.orig/modules.d/90kernel-modules/module-setup.sh
|
||||
+++ dracut-027_git201305310800/modules.d/90kernel-modules/module-setup.sh
|
||||
@@ -74,7 +74,7 @@ installkernel() {
|
||||
}
|
||||
|
||||
@ -57,10 +49,8 @@ Index: dracut-027_git201304121327/modules.d/90kernel-modules/module-setup.sh
|
||||
[[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
|
||||
if ! dracut_module_included "systemd"; then
|
||||
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
|
||||
Index: dracut-027_git201304121327/modules.d/95udev-rules/module-setup.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/modules.d/95udev-rules/module-setup.sh
|
||||
+++ dracut-027_git201304121327/modules.d/95udev-rules/module-setup.sh
|
||||
--- dracut-027_git201305310800.orig/modules.d/95udev-rules/module-setup.sh
|
||||
+++ dracut-027_git201305310800/modules.d/95udev-rules/module-setup.sh
|
||||
@@ -11,6 +11,8 @@ install() {
|
||||
dracut_install udevadm cat uname blkid \
|
||||
/etc/udev/udev.conf
|
||||
@ -70,13 +60,11 @@ Index: dracut-027_git201304121327/modules.d/95udev-rules/module-setup.sh
|
||||
[ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
|
||||
for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
|
||||
[ -x "$_i" ] || continue
|
||||
Index: dracut-027_git201304121327/modules.d/98systemd/rescue.service
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/modules.d/98systemd/rescue.service
|
||||
+++ dracut-027_git201304121327/modules.d/98systemd/rescue.service
|
||||
@@ -14,7 +14,7 @@ DefaultDependencies=no
|
||||
[Service]
|
||||
Environment=HOME=/
|
||||
--- dracut-027_git201305310800.orig/modules.d/98systemd/rescue.service
|
||||
+++ dracut-027_git201305310800/modules.d/98systemd/rescue.service
|
||||
@@ -16,7 +16,7 @@ Environment=HOME=/
|
||||
Environment=DRACUT_SYSTEMD=1
|
||||
Environment=NEWROOT=/sysroot
|
||||
WorkingDirectory=/
|
||||
-ExecStartPre=-/bin/plymouth quit
|
||||
+ExecStartPre=-/usr/bin/plymouth quit
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:436a26f46efb3f9b21a035583c244d7212218d251db83d8813c6b09f1bb1c247
|
||||
size 203196
|
3
dracut-027_git201306061213.tar.xz
Normal file
3
dracut-027_git201306061213.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c27c2afe4177d56e7ab18a5213b9d090319b76473d490e1d6668c098b8f513d
|
||||
size 204312
|
13
dracut-font.patch
Normal file
13
dracut-font.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
||||
index 60a50e7..fcd8282 100755
|
||||
--- a/modules.d/10i18n/module-setup.sh
|
||||
+++ b/modules.d/10i18n/module-setup.sh
|
||||
@@ -14,7 +14,7 @@ depends() {
|
||||
install() {
|
||||
dracut_install -o $systemdutildir/systemd-vconsole-setup
|
||||
KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
|
||||
- DEFAULT_FONT=latarcyrheb-sun16
|
||||
+ DEFAULT_FONT=LatArCyrHeb-16
|
||||
I18N_CONF="/etc/locale.conf"
|
||||
VCONFIG_CONF="/etc/vconsole.conf"
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 6 19:20:47 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
- version 027_git201306061213
|
||||
* setup correct system time and time zone in initrd
|
||||
* systemd integration bugfixes
|
||||
* lvm bugfixes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 8 23:05:40 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
%define replace_mkinitrd 0
|
||||
|
||||
Name: dracut
|
||||
Version: 027_git201304121327
|
||||
Version: 027_git201306061213
|
||||
Release: 0
|
||||
|
||||
Summary: Initramfs generator using udev
|
||||
@ -43,7 +43,8 @@ Patch1: use_initrd_insteadof_initramfs.patch
|
||||
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@gmail.com
|
||||
Patch3: use_all_paths_udev.patch
|
||||
|
||||
# PATCH-FIX-OPENSUSE default console font is wrong for openSUSE crrodriguez@opensuse.org
|
||||
Patch4: dracut-font.patch
|
||||
BuildRequires: bash
|
||||
BuildRequires: dash
|
||||
|
||||
@ -120,7 +121,7 @@ This package contains tools to assemble the local initrd and host configuration.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%patch4 -p1
|
||||
%build
|
||||
%configure\
|
||||
--systemdsystemunitdir=%{_unitdir}\
|
||||
@ -164,6 +165,7 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log
|
||||
install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
|
||||
|
||||
%if !%{replace_mkinitrd}
|
||||
rm %{buildroot}/etc/bash_completion.d/lsinitrd
|
||||
rm %{buildroot}%{_bindir}/mkinitrd
|
||||
rm %{buildroot}%{_bindir}/lsinitrd
|
||||
rm %{buildroot}%{_mandir}/man8/mkinitrd*
|
||||
@ -185,6 +187,7 @@ rm -rf %{buildroot}
|
||||
%if %{replace_mkinitrd}
|
||||
%{_bindir}/mkinitrd
|
||||
%{_bindir}/lsinitrd
|
||||
/etc/bash_completion.d/lsinitrd
|
||||
%endif
|
||||
%dir %{dracutlibdir}
|
||||
%dir %{dracutlibdir}/modules.d
|
||||
|
@ -1,7 +1,5 @@
|
||||
Index: dracut-027_git201304121327/dracut.8.asc
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/dracut.8.asc
|
||||
+++ dracut-027_git201304121327/dracut.8.asc
|
||||
--- dracut-027_git201305310800.orig/dracut.8.asc
|
||||
+++ dracut-027_git201305310800/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
|
||||
@ -20,10 +18,8 @@ Index: dracut-027_git201304121327/dracut.8.asc
|
||||
contains the kernel modules of the currently active kernel with version
|
||||
_++<kernel version>++_.
|
||||
|
||||
Index: dracut-027_git201304121327/dracut.asc
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/dracut.asc
|
||||
+++ dracut-027_git201304121327/dracut.asc
|
||||
--- dracut-027_git201305310800.orig/dracut.asc
|
||||
+++ dracut-027_git201305310800/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
|
||||
@ -111,10 +107,8 @@ Index: dracut-027_git201304121327/dracut.asc
|
||||
----
|
||||
|
||||
This will reduce the size of the initramfs image significantly.
|
||||
Index: dracut-027_git201304121327/dracut-initramfs-restore.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/dracut-initramfs-restore.sh
|
||||
+++ dracut-027_git201304121327/dracut-initramfs-restore.sh
|
||||
--- dracut-027_git201305310800.orig/dracut-initramfs-restore.sh
|
||||
+++ dracut-027_git201305310800/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"
|
||||
@ -124,10 +118,8 @@ Index: dracut-027_git201304121327/dracut-initramfs-restore.sh
|
||||
|
||||
cd /run/initramfs
|
||||
|
||||
Index: dracut-027_git201304121327/dracut.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/dracut.sh
|
||||
+++ dracut-027_git201304121327/dracut.sh
|
||||
--- dracut-027_git201305310800.orig/dracut.sh
|
||||
+++ dracut-027_git201305310800/dracut.sh
|
||||
@@ -484,7 +484,7 @@ if ! [[ $outfile ]]; then
|
||||
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
|
||||
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
|
||||
@ -137,10 +129,8 @@ Index: dracut-027_git201304121327/dracut.sh
|
||||
fi
|
||||
fi
|
||||
|
||||
Index: dracut-027_git201304121327/mkinitrd-dracut.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/mkinitrd-dracut.sh
|
||||
+++ dracut-027_git201304121327/mkinitrd-dracut.sh
|
||||
--- dracut-027_git201305310800.orig/mkinitrd-dracut.sh
|
||||
+++ dracut-027_git201305310800/mkinitrd-dracut.sh
|
||||
@@ -11,7 +11,7 @@ usage () {
|
||||
$cmd " [--nocompress]"
|
||||
$cmd " <initrd-image> <kernel-version>"
|
||||
@ -150,11 +140,9 @@ Index: dracut-027_git201304121327/mkinitrd-dracut.sh
|
||||
|
||||
[[ $1 = '-n' ]] && exit 0
|
||||
exit 1
|
||||
Index: dracut-027_git201304121327/lsinitrd.1.asc
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/lsinitrd.1.asc
|
||||
+++ dracut-027_git201304121327/lsinitrd.1.asc
|
||||
@@ -16,7 +16,7 @@ DESCRIPTION
|
||||
--- dracut-027_git201305310800.orig/lsinitrd.1.asc
|
||||
+++ dracut-027_git201305310800/lsinitrd.1.asc
|
||||
@@ -18,7 +18,7 @@ DESCRIPTION
|
||||
-----------
|
||||
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
|
||||
lsinitrd uses the default image _/boot/<machine-id>/<kernel-version>/initrd_ or
|
||||
@ -163,12 +151,10 @@ Index: dracut-027_git201304121327/lsinitrd.1.asc
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
Index: dracut-027_git201304121327/lsinitrd.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/lsinitrd.sh
|
||||
+++ dracut-027_git201304121327/lsinitrd.sh
|
||||
@@ -60,7 +60,7 @@ else
|
||||
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
||||
--- dracut-027_git201305310800.orig/lsinitrd.sh
|
||||
+++ dracut-027_git201305310800/lsinitrd.sh
|
||||
@@ -84,7 +84,7 @@ else
|
||||
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
||||
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
|
||||
else
|
||||
- image="/boot/initramfs-${KERNEL_VERSION}.img"
|
||||
@ -176,10 +162,8 @@ Index: dracut-027_git201304121327/lsinitrd.sh
|
||||
fi
|
||||
fi
|
||||
|
||||
Index: dracut-027_git201304121327/51-dracut-rescue-postinst.sh
|
||||
===================================================================
|
||||
--- dracut-027_git201304121327.orig/51-dracut-rescue-postinst.sh
|
||||
+++ dracut-027_git201304121327/51-dracut-rescue-postinst.sh
|
||||
--- dracut-027_git201305310800.orig/51-dracut-rescue-postinst.sh
|
||||
+++ dracut-027_git201305310800/51-dracut-rescue-postinst.sh
|
||||
@@ -18,7 +18,7 @@ fi
|
||||
[[ $MACHINE_ID ]] || exit 1
|
||||
[[ -f $KERNEL_IMAGE ]] || exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user