Accepting request 755471 from Base:System

- Update to version 049+git116.e9995c78:
  * dracut.spec: add convertfs module correctly (boo#1158777)

OBS-URL: https://build.opensuse.org/request/show/755471
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2019-12-23 21:34:55 +00:00 committed by Git OBS Bridge
commit 6f003b085b
8 changed files with 19 additions and 13 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 10 08:43:44 UTC 2019 - daniel.molkentin@suse.com
- Update to version 049+git116.e9995c78:
* dracut.spec: add convertfs module correctly (boo#1158777)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 28 08:05:53 UTC 2019 - daniel.molkentin@suse.com Thu Nov 28 08:05:53 UTC 2019 - daniel.molkentin@suse.com

View File

@ -1,5 +1,5 @@
name: dracut name: dracut
version: 049+git115.c2d8d6fb version: 049+git116.e9995c78
mtime: 1574828019 mtime: 1575967394
commit: c2d8d6fb4c700f40eaaa30cffac41e3d8071c20b commit: e9995c7853e61de8513b41a302d465ddb1586a20

View File

@ -19,7 +19,7 @@
%define dracutlibdir %{_prefix}/lib/dracut %define dracutlibdir %{_prefix}/lib/dracut
Name: dracut Name: dracut
Version: 049+git115.c2d8d6fb Version: 049+git116.e9995c78
Release: 0 Release: 0
Summary: Initramfs generator using udev Summary: Initramfs generator using udev
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -179,11 +179,11 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
# check whether /var/run has been converted to a symlink # 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 ] || sed -i '/GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ rd.convertfs"/' /etc/default/grub || :
[ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF [ -L /var/run ] || cat >>/etc/dracut.conf.d/05-convertfs.conf<<EOF
add_dracutmodules+="convertfs" add_dracutmodules+=" convertfs "
EOF EOF
#clean up after the conversion is done #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 '/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 || : [ -L /var/run ] && sed -i '/add_dracutmodules+=" *convertfs *"/d' /etc/dracut.conf.d/05-convertfs.conf || :
[ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || : [ -d /var/lock.lockmove~ ] && rm -rf /var/lock.lockmove~ || :
[ -d /var/run.runmove~ ] && rm -rf /var/run.runmove~ || : [ -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 || : [ -s /etc/dracut.conf.d/05-convertfs.conf ] || rm -f /etc/dracut.conf.d/05-convertfs.conf || :