Merge "Make the network script explicitly dependent on setup-bootdev to avoid race condition in systemd"
This commit is contained in:
commit
b61b89a754
|
@ -171,6 +171,8 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \
|
||||||
|
|
||||||
# Enabling pre-init boot interface discovery
|
# Enabling pre-init boot interface discovery
|
||||||
#sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on
|
#sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on
|
||||||
|
# Make the network script dependent on the setup-bootdev for correst network starting
|
||||||
|
sudo sed -i -e 's|\(^# Should-Start:.*\)|\1 setup-bootdev|' $(INITRAMROOT)/etc/init.d/network
|
||||||
|
|
||||||
# Setting root password into r00tme
|
# Setting root password into r00tme
|
||||||
sudo sed -i -e '/^root/c\root:$$6$$oC7haQNQ$$LtVf6AI.QKn9Jb89r83PtQN9fBqpHT9bAFLzy.YVxTLiFgsoqlPY3awKvbuSgtxYHx4RUcpUqMotp.WZ0Hwoj.:15441:0:99999:7:::' $(INITRAMROOT)/etc/shadow
|
sudo sed -i -e '/^root/c\root:$$6$$oC7haQNQ$$LtVf6AI.QKn9Jb89r83PtQN9fBqpHT9bAFLzy.YVxTLiFgsoqlPY3awKvbuSgtxYHx4RUcpUqMotp.WZ0Hwoj.:15441:0:99999:7:::' $(INITRAMROOT)/etc/shadow
|
||||||
|
|
24
config.mk
24
config.mk
|
@ -86,18 +86,18 @@ DENY_RPM_DOWNGRADE?=1
|
||||||
NO_UI_OPTIMIZE:=0
|
NO_UI_OPTIMIZE:=0
|
||||||
|
|
||||||
# Repos and versions
|
# Repos and versions
|
||||||
FUELLIB_COMMIT?=master
|
FUELLIB_COMMIT?=stable/8.0
|
||||||
NAILGUN_COMMIT?=master
|
NAILGUN_COMMIT?=stable/8.0
|
||||||
PYTHON_FUELCLIENT_COMMIT?=master
|
PYTHON_FUELCLIENT_COMMIT?=stable/8.0
|
||||||
FUEL_AGENT_COMMIT?=master
|
FUEL_AGENT_COMMIT?=stable/8.0
|
||||||
FUEL_NAILGUN_AGENT_COMMIT?=master
|
FUEL_NAILGUN_AGENT_COMMIT?=stable/8.0
|
||||||
ASTUTE_COMMIT?=master
|
ASTUTE_COMMIT?=stable/8.0
|
||||||
OSTF_COMMIT?=master
|
OSTF_COMMIT?=stable/8.0
|
||||||
FUEL_MIRROR_COMMIT?=master
|
FUEL_MIRROR_COMMIT?=stable/8.0
|
||||||
FUELMENU_COMMIT?=master
|
FUELMENU_COMMIT?=stable/8.0
|
||||||
SHOTGUN_COMMIT?=master
|
SHOTGUN_COMMIT?=stable/8.0
|
||||||
NETWORKCHECKER_COMMIT?=master
|
NETWORKCHECKER_COMMIT?=stable/8.0
|
||||||
FUELUPGRADE_COMMIT?=master
|
FUELUPGRADE_COMMIT?=stable/8.0
|
||||||
|
|
||||||
FUELLIB_REPO?=https://github.com/openstack/fuel-library.git
|
FUELLIB_REPO?=https://github.com/openstack/fuel-library.git
|
||||||
NAILGUN_REPO?=https://github.com/openstack/fuel-web.git
|
NAILGUN_REPO?=https://github.com/openstack/fuel-web.git
|
||||||
|
|
Loading…
Reference in New Issue