Skip to content

Commit fe58ff3

Browse files
committed
Merge pull request #148 from scaleway/moul-patch-1
Moul patch 1
2 parents 5fbb115 + a1d60b3 commit fe58ff3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Linux/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Here are the availble *initrd variables*:
134134

135135
### master (unreleased)
136136

137-
* No entry
137+
* Allow alternative ip option
138138

139139
### 3.9 (2016-03-07)
140140

Linux/tree-common/init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ INTERFACES=$(ifconfig -a | grep -o '^eth[0-9]')
8080
for INTERFACE in $INTERFACES; do
8181
run ifconfig $INTERFACE up
8282
done
83-
if [ "$(get_opt ip)" = "dhcp" ]; then
83+
if [ "$(get_opt ip)" = "dhcp" -o "$(get_opt ip)" = ":::::eth0:" ]; then
8484
for INTERFACE in $INTERFACES; do
8585
run udhcpc -n -q -i $INTERFACE up
8686
done

0 commit comments

Comments
 (0)