2014-06-17 07:43:08 +00:00
|
|
|
From ad967a08bbf67171a75acc84a9ea2ffbd9461aa5 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
|
|
|
Date: Wed, 4 Jun 2014 12:04:10 +0200
|
|
|
|
|
Subject: 40network: always start netroot in ifup.sh
|
|
|
|
|
|
|
|
|
|
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@suse.de>
|
|
|
|
|
---
|
|
|
|
|
modules.d/40network/ifup.sh | 22 ++++++++--------------
|
|
|
|
|
1 file changed, 8 insertions(+), 14 deletions(-)
|
|
|
|
|
|
2015-06-30 12:59:59 +00:00
|
|
|
Index: dracut-042/modules.d/40network/ifup.sh
|
2015-03-31 14:12:12 +00:00
|
|
|
===================================================================
|
2015-06-30 12:59:59 +00:00
|
|
|
--- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-11 17:39:47.000000000 +0200
|
|
|
|
|
+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:05.645160455 +0200
|
|
|
|
|
@@ -338,21 +338,15 @@ for p in $(getargs ip=); do
|
2015-03-31 14:12:12 +00:00
|
|
|
esac
|
|
|
|
|
done
|
2014-06-17 07:43:08 +00:00
|
|
|
|
|
|
|
|
- > /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
|
