- Update to version 049.1+git119.abf1a408:

* 30convertfs: adopt for SUSE (boo#1158777)

OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=392
This commit is contained in:
Daniel Molkentin 2020-01-29 13:03:12 +00:00 committed by Git OBS Bridge
parent 1994b0b8cf
commit 2065b56d8d
10 changed files with 36 additions and 19 deletions

View File

@ -3,7 +3,7 @@
<param name="scm">git</param>
<param name="url">https://github.com/opensuse/dracut.git</param>
<param name="revision">SUSE/049</param>
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
<param name="versionformat">@PARENT_TAG@.1+git@TAG_OFFSET@.%h</param>
<param name="extract">suse/dracut.spec</param>
<param name="extract">suse/README.susemaint</param>
<param name="changesgenerate">enable</param>

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/opensuse/dracut.git</param>
<param name="changesrevision">a6090e2f68a4ca727005b1de8a45bf474a782008</param></service></servicedata>
<param name="changesrevision">abf1a4086cdd0e6f528d99265f91fbc7ac9fca71</param></service></servicedata>

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 29 12:54:35 UTC 2020 - daniel.molkentin@suse.com
- Update to version 049.1+git119.abf1a408:
* 30convertfs: adopt for SUSE (boo#1158777)
-------------------------------------------------------------------
Tue Jan 14 14:22:25 UTC 2020 - daniel.molkentin@suse.com

View File

@ -1,5 +1,5 @@
name: dracut
version: 049+git118.a6090e2f
mtime: 1579011522
commit: a6090e2f68a4ca727005b1de8a45bf474a782008
version: 049.1+git119.abf1a408
mtime: 1580302367
commit: abf1a4086cdd0e6f528d99265f91fbc7ac9fca71

View File

@ -19,7 +19,7 @@
%define dracutlibdir %{_prefix}/lib/dracut
Name: dracut
Version: 049+git118.a6090e2f
Version: 049.1+git119.abf1a408
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -172,16 +172,23 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
%post
# check whether /var/run has been converted to a symlink
[ -L /var/run ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
if [ ! -L /var/run ]; then
grep -q '^[ ]*GRUB_CMDLINE_LINUX_DEFAULT=.*rd.convertfs' /etc/default/grub || \
sed -i '/^[ ]*GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
if ! grep --no-message 'add_dracutmodules+=" convertfs "' /etc/dracut.conf.d/05-convertfs.conf; then
cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
add_dracutmodules+=" convertfs "
EOF
fi
fi
#clean up after the conversion is done
[ -L /var/run ] && sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
[ -L /var/run ] && sed -i '/add_dracutmodules+=" *convertfs *"/d' /etc/dracut.conf.d/05-convertfs.conf || :
if [ -L /var/run ] && [ -f /etc/dracut.conf.d/05-convertfs.conf ]; then
sed -i '/^[ ]*GRUB_CMDLINE_LINUX_DEFAULT.*/s/rd.convertfs//' /etc/default/grub || :
[ -f /etc/dracut.conf.d/05-convertfs.conf ] && sed -i '/add_dracutmodules+="[ ]*convertfs[ ]*"/d' /etc/dracut.conf.d/05-convertfs.conf || :
[ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :
[ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
[ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || :
[ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :
fi
%{?regenerate_initrd_post}
%post fips

4
update-dracut.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/sh
osc rm -f *.obscpio *.xz
osc service localrun
osc add *.obscpio *.xz