Some tiny fixes

Some tiny fixes

[Thomas Renninger]

Hi,

would be great if these can be applied in the mainline dracut git tree.

Thanks,

      Thomas

[PATCH 1/4] Correct paths for openSUSE

[Thomas Renninger]

From: Christian Rodrigues <crrodriguez-stAJ6ESoqRxg9hUCZPvPmw@public.gmane.org>

openSUSE has things stored in different places, so fixup the
paths here.

Signed-off-by: Christian Rodrigues <crrodriguez-stAJ6ESoqRxg9hUCZPvPmw@public.gmane.org>
Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
---
 dracut.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut.sh b/dracut.sh
index 17bf8f2..1aa7d31 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -809,7 +809,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
 [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
 [[ $tmpdir ]] || tmpdir=/var/tmp
 [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
-- 
2.1.4

Re: [PATCH 1/4] Correct paths for openSUSE

[Harald Hoyer]

On 23.03.2015 17:12, Thomas Renninger wrote:
> From: Christian Rodrigues <crrodriguez-stAJ6ESoqRxg9hUCZPvPmw@public.gmane.org>
> 
> openSUSE has things stored in different places, so fixup the
> paths here.
> 
> Signed-off-by: Christian Rodrigues <crrodriguez-stAJ6ESoqRxg9hUCZPvPmw@public.gmane.org>
> Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
> ---
>  dracut.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/dracut.sh b/dracut.sh
> index 17bf8f2..1aa7d31 100755
> --- a/dracut.sh
> +++ b/dracut.sh
> @@ -809,7 +809,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
>  [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
>  [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
>  [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
> -[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
> +[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
>  [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
>  [[ $tmpdir ]] || tmpdir=/var/tmp
>  [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
> 

pushed, thanks

[PATCH 2/4] 40network: Fix race condition when wait for networks

[Thomas Renninger]

From: Pawel Wieczorkiewicz <pwieczorkiewicz-l3A5Bk7waGM@public.gmane.org>

If no network related params are specific, but rd.neednet=1 is set,
the default initqueue action is to wait until one of the network
interfaces is marked as setup properly.

This also help with initqueue's race condition when the network interface
shows upd late

References: bnc#866771

Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
---
 modules.d/40network/net-genrules.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
index 77e47b5..2c955b7 100755
--- a/modules.d/40network/net-genrules.sh
+++ b/modules.d/40network/net-genrules.sh
@@ -95,7 +95,10 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
     else
         cond='ACTION=="add", SUBSYSTEM=="net"'
         # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
-        echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
+        if [ "$NEEDNET" = "1" ]; then
+            echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
+            echo "[ -f /tmp/net.*.did-setup ]" >$hookdir/initqueue/finished/wait-network.sh
+        fi
     fi
 
 # if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh
-- 
2.1.4

Re: [PATCH 2/4] 40network: Fix race condition when wait for networks

[Harald Hoyer]

On 23.03.2015 17:12, Thomas Renninger wrote:
> From: Pawel Wieczorkiewicz <pwieczorkiewicz-l3A5Bk7waGM@public.gmane.org>
> 
> If no network related params are specific, but rd.neednet=1 is set,
> the default initqueue action is to wait until one of the network
> interfaces is marked as setup properly.
> 
> This also help with initqueue's race condition when the network interface
> shows upd late
> 
> References: bnc#866771
> 
> Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
> ---
>  modules.d/40network/net-genrules.sh | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
> index 77e47b5..2c955b7 100755
> --- a/modules.d/40network/net-genrules.sh
> +++ b/modules.d/40network/net-genrules.sh
> @@ -95,7 +95,10 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
>      else
>          cond='ACTION=="add", SUBSYSTEM=="net"'
>          # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
> -        echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
> +        if [ "$NEEDNET" = "1" ]; then
> +            echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
> +            echo "[ -f /tmp/net.*.did-setup ]" >$hookdir/initqueue/finished/wait-network.sh

err, if multiple networks are up, [ -f /tmp/net.*.did-setup ] is not correct
shell syntax.

$ [ -e /dev/* ] && echo OK
bash: [: too many arguments

> +        fi
>      fi
>  
>  # if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh
> 

Re: [PATCH 2/4] 40network: Fix race condition when wait for networks

[Pawel Wieczorkiewicz]

On Tue, 02 Jun 2015 12:15:26 +0200
Harald Hoyer <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:

> > +            echo "[ -f /tmp/net.*.did-setup ]"
> > >$hookdir/initqueue/finished/wait-network.sh
> 
> err, if multiple networks are up, [ -f /tmp/net.*.did-setup ] is not
> correct shell syntax.
> 
> $ [ -e /dev/* ] && echo OK
> bash: [: too many arguments
> 

Can this condition really occur?
Shouldn't we be done with the wait-network initqueue job condition just
after 1st network is setup (the '*' here just means whatever interface
is up, not multiple interfaces)?

AFAIR each network ifup request is a separate initqueue job and the
condition is evaluated between jobs switches. So first
created /tmp/net.*.did-setup, whatever interface it has, makes this
condition be satisfied.

This way or another, it can be improved to the longer and more
demanding multifiles variant (for file in /tmp/net.*.did-setup loop or
set -- /tmp/net.*.did-setup and $# > 0 evaluation).

-- 
Best Regards,
Pawel Wieczorkiewicz <pwieczorkiewicz-l3A5Bk7waGM@public.gmane.org>, Linux System Developer

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Dilip Upmanyu,
Graham Norton, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 / 90409
Nürnberg / Germany / Phone: +49-911-740 53 - 613

[PATCH 3/4] 40network: always start netroot in ifup.sh

[Thomas Renninger]

From: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>

It's totally irrelevant how the network is configured when
trying to setup netroot. It only matters if it could be
configured at all.
So change the logic the check for correct network setup
and then start netroot.

References: bnc#881235

Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
---
 modules.d/40network/ifup.sh | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
index de518b6..9af5474 100755
--- a/modules.d/40network/ifup.sh
+++ b/modules.d/40network/ifup.sh
@@ -338,21 +338,15 @@ for p in $(getargs ip=); do
         esac
     done
 
-    > /tmp/net.${netif}.up
+    if [ $? -eq 0 ]; then
+        > /tmp/net.${netif}.up
 
-    case $autoconf in
-        dhcp|on|any|dhcp6)
-            ;;
-        *)
-            if [ $? -eq 0 ]; then
-                setup_net $netif
-                source_hook initqueue/online $netif
-                if [ -z "$manualup" ]; then
-                    /sbin/netroot $netif
-                fi
-            fi
-            ;;
-    esac
+        setup_net $netif
+        source_hook initqueue/online $netif
+        if [ -z "$manualup" ]; then
+            /sbin/netroot $netif
+        fi
+    fi
 
     exit 0
 done
-- 
2.1.4

Re: [PATCH 3/4] 40network: always start netroot in ifup.sh

[Harald Hoyer]

On 23.03.2015 17:12, Thomas Renninger wrote:
> From: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> 
> It's totally irrelevant how the network is configured when
> trying to setup netroot. It only matters if it could be
> configured at all.
> So change the logic the check for correct network setup
> and then start netroot.
> 
> References: bnc#881235
> 
> Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
> ---
>  modules.d/40network/ifup.sh | 22 ++++++++--------------
>  1 file changed, 8 insertions(+), 14 deletions(-)
> 
> diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
> index de518b6..9af5474 100755
> --- a/modules.d/40network/ifup.sh
> +++ b/modules.d/40network/ifup.sh
> @@ -338,21 +338,15 @@ for p in $(getargs ip=); do
>          esac
>      done
>  
> -    > /tmp/net.${netif}.up
> +    if [ $? -eq 0 ]; then
> +        > /tmp/net.${netif}.up
>  
> -    case $autoconf in
> -        dhcp|on|any|dhcp6)
> -            ;;
> -        *)
> -            if [ $? -eq 0 ]; then
> -                setup_net $netif
> -                source_hook initqueue/online $netif
> -                if [ -z "$manualup" ]; then
> -                    /sbin/netroot $netif
> -                fi
> -            fi
> -            ;;
> -    esac
> +        setup_net $netif
> +        source_hook initqueue/online $netif
> +        if [ -z "$manualup" ]; then
> +            /sbin/netroot $netif
> +        fi
> +    fi
>  
>      exit 0
>  done
> 

Well, for dhcp, the dhclient-script.sh adds an initqueue script
setup_net_$netif.sh, which does:

. /lib/net-lib.sh
setup_net $netif
source_hook initqueue/online $netif
/sbin/netroot $netif

[PATCH 4/4] 95fcoe-uefi: Test for EFI firmware

[Thomas Renninger]

From: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>

The fcoe-uefi module should test for EFI firmware when called
in 'hostonly' mode; of no EFI firmware is found then the module
doesn't need to be included.

References: bnc#882412

Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
---
 modules.d/95fcoe-uefi/module-setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh
index 8b8c810..5d8477c 100755
--- a/modules.d/95fcoe-uefi/module-setup.sh
+++ b/modules.d/95fcoe-uefi/module-setup.sh
@@ -2,6 +2,9 @@
 
 # called by dracut
 check() {
+    [[ $hostonly ]] || [[ $mount_needs ]] && {
+        [ -d /sys/firmware/efi ] || return 255
+    }
     require_binaries dcbtool fipvlan lldpad ip readlink || return 1
     return 0
 }
-- 
2.1.4

[Dracut GitHub] Patchset imported to github

[Dracut GitHub Import Bot]

Patchset imported to github.
Pull request:
<https://github.com/haraldh/dracut/compare/master...dracut-mailing-devs:1427127138-12932-5-git-send-email-trenn@suse.de>

Re: [PATCH 4/4] 95fcoe-uefi: Test for EFI firmware

[Harald Hoyer]

On 23.03.2015 17:12, Thomas Renninger wrote:
> From: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> 
> The fcoe-uefi module should test for EFI firmware when called
> in 'hostonly' mode; of no EFI firmware is found then the module
> doesn't need to be included.
> 
> References: bnc#882412
> 
> Signed-off-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> Signed-off-by: Thomas Renninger <trenn-l3A5Bk7waGM@public.gmane.org>
> ---
>  modules.d/95fcoe-uefi/module-setup.sh | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh
> index 8b8c810..5d8477c 100755
> --- a/modules.d/95fcoe-uefi/module-setup.sh
> +++ b/modules.d/95fcoe-uefi/module-setup.sh
> @@ -2,6 +2,9 @@
>  
>  # called by dracut
>  check() {
> +    [[ $hostonly ]] || [[ $mount_needs ]] && {
> +        [ -d /sys/firmware/efi ] || return 255
> +    }
>      require_binaries dcbtool fipvlan lldpad ip readlink || return 1
>      return 0
>  }
> 

pushed, thanks