Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2018-04-22 14:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Sun Apr 22 14:35:18 2018 rev:124 rq:598536 version:044.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2018-03-24 16:06:10.035424082 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2018-04-22 14:35:19.830323802 +0200 @@ -1,0 +2,16 @@ +Thu Apr 19 11:51:07 UTC 2018 - [email protected] + +- Do not attempt to run purge-kernels.service on ro rootfs (bsc#1087880) + +------------------------------------------------------------------- +Thu Apr 19 11:36:26 UTC 2018 - [email protected] + +- 95nfs: If no server is configured, read BOOTSERVERADDR from wicked's leaseinf + (boo#1089332) + * adds 0566-95nfs-If-no-server-is-configured-read-BOOTSERVERADDR.patch +------------------------------------------------------------------- +Thu Apr 5 11:05:15 UTC 2018 - [email protected] + +- Remove RH-specific s390 modules (bsc#1086216) + +------------------------------------------------------------------- New: ---- 0566-95nfs-If-no-server-is-configured-read-BOOTSERVERADDR.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.XgD4sF/_old 2018-04-22 14:35:23.210201487 +0200 +++ /var/tmp/diff_new_pack.XgD4sF/_new 2018-04-22 14:35:23.218201198 +0200 @@ -386,6 +386,8 @@ Patch564: 0564-40network-Always-set-the-gw-variable.patch # Patch submitted to upstream as 774090d2223cc58db259f5670bde17bd37b286ea Patch565: 0565-90kernel-modules-Include-Intel-Volume-Management-Dev.patch +# Patch specific to SUSE, not upstream +Patch566: 0566-95nfs-If-no-server-is-configured-read-BOOTSERVERADDR.patch BuildRequires: asciidoc BuildRequires: bash @@ -674,6 +676,7 @@ %patch563 -p1 %patch564 -p1 %patch565 -p1 +%patch566 -p1 %build %configure\ @@ -694,6 +697,11 @@ rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox +# Remove RH-specific s390 modules +rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95dasd +rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95zfcp +rm -fr %{buildroot}/%{dracutlibdir}/modules.d/95znet + # remove gentoo specific modules rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash @@ -888,7 +896,6 @@ %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop %{dracutlibdir}/modules.d/91zipl -%{dracutlibdir}/modules.d/95znet %{dracutlibdir}/modules.d/95fcoe-uefi %{dracutlibdir}/modules.d/95nbd %{dracutlibdir}/modules.d/95nfs @@ -900,12 +907,10 @@ %{dracutlibdir}/modules.d/95resume %{dracutlibdir}/modules.d/95rootfs-block %{dracutlibdir}/modules.d/95dcssblk -%{dracutlibdir}/modules.d/95dasd %{dracutlibdir}/modules.d/95dasd_mod %{dracutlibdir}/modules.d/95dasd_rules %{dracutlibdir}/modules.d/95fstab-sys %{dracutlibdir}/modules.d/95lunmask -%{dracutlibdir}/modules.d/95zfcp %{dracutlibdir}/modules.d/95zfcp_rules %{dracutlibdir}/modules.d/95qeth_rules %{dracutlibdir}/modules.d/95terminfo ++++++ 0566-95nfs-If-no-server-is-configured-read-BOOTSERVERADDR.patch ++++++ >From af76a8ca775ba44815116ae880de56d7a8a03c97 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Thu, 12 Apr 2018 14:27:43 +0200 Subject: [PATCH] 95nfs: If no server is configured, read BOOTSERVERADDR from wicked's leaseinfo References: boo#1089332 --- modules.d/95nfs/nfs-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules.d/95nfs/nfs-lib.sh b/modules.d/95nfs/nfs-lib.sh index 58aa7e30..b2e5f91d 100755 --- a/modules.d/95nfs/nfs-lib.sh +++ b/modules.d/95nfs/nfs-lib.sh @@ -106,7 +106,7 @@ anaconda_nfsv6_to_var() { # fill in missing server/path from DHCP options. nfsroot_from_dhcp() { local f - for f in /tmp/net.$1.override /tmp/dhclient.$1.dhcpopts; do + for f in /tmp/net.$1.override /tmp/dhclient.$1.dhcpopts /tmp/leaseinfo.$1.dhcp.*; do [ -f $f ] && . $f done [ -n "$new_root_path" ] && nfsroot_to_var "$nfs:$new_root_path" @@ -114,6 +114,7 @@ nfsroot_from_dhcp() { [ -z "$server" ] && server=$srv [ -z "$server" ] && server=$new_dhcp_server_identifier [ -z "$server" ] && server=$new_next_server + [ -z "$server" ] && server=$BOOTSERVERADDR [ -z "$server" ] && server=${new_root_path%%:*} } -- 2.13.6 ++++++ purge-kernels.service ++++++ --- /var/tmp/diff_new_pack.XgD4sF/_old 2018-04-22 14:35:24.094169497 +0200 +++ /var/tmp/diff_new_pack.XgD4sF/_new 2018-04-22 14:35:24.094169497 +0200 @@ -2,6 +2,7 @@ Description=Purge old kernels After=local-fs.target ConditionPathExists=/boot/do_purge_kernels +ConditionPathIsReadWrite=/ [Service] Type=oneshot
