diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 34c0ef453..d7ca65e7a 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -137,7 +137,7 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on # 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 # Copying rsa key. sudo mkdir -p $(INITRAMROOT)/root/.ssh diff --git a/iso/module.mk b/iso/module.mk index fb37a3e77..aa8320470 100644 --- a/iso/module.mk +++ b/iso/module.mk @@ -272,14 +272,14 @@ $(IMG_PATH): $(ISO_PATH) sudo mv $(BUILD_DIR)/iso/imgroot/isolinux $(BUILD_DIR)/iso/imgroot/syslinux sudo rm $(BUILD_DIR)/iso/imgroot/syslinux/isolinux.cfg sudo cp $(SOURCE_DIR)/iso/syslinux/syslinux.cfg $(BUILD_DIR)/iso/imgroot/syslinux # NOTE(mihgen): Is it used for IMG file? Comments needed! - sudo sed -i '' -e "s/will_be_substituted_with_actual_uuid/`cat $(BUILD_DIR)/iso/img_loop_uuid`/g" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg + sudo sed -i -e "s/will_be_substituted_with_actual_uuid/`cat $(BUILD_DIR)/iso/img_loop_uuid`/g" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo sed -r -i -e "s/ip=[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/ip=$(MASTER_IP)/" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo sed -r -i -e "s/dns1=[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/dns1=$(MASTER_DNS)/" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo sed -r -i -e "s/netmask=[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/netmask=$(MASTER_NETMASK)/" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo sed -r -i -e "s/gw=[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}/gw=$(MASTER_GW)/" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo sed -r -i -e "s/will_be_substituted_with_PRODUCT_VERSION/$(PRODUCT_VERSION)/" $(BUILD_DIR)/iso/imgroot/syslinux/syslinux.cfg sudo cp $(BUILD_DIR)/iso/isoroot/ks.cfg $(BUILD_DIR)/iso/imgroot/ks.cfg - sudo sed -i '' -e "s/will_be_substituted_with_actual_uuid/`cat $(BUILD_DIR)/iso/img_loop_uuid`/g" $(BUILD_DIR)/iso/imgroot/ks.cfg + sudo sed -i -e "s/will_be_substituted_with_actual_uuid/`cat $(BUILD_DIR)/iso/img_loop_uuid`/g" $(BUILD_DIR)/iso/imgroot/ks.cfg sudo cp $(ISO_PATH) $(BUILD_DIR)/iso/imgroot/nailgun.iso sudo sync sudo umount `cat $(BUILD_DIR)/iso/img_loop_partition` diff --git a/mirror/ubuntu/createchroot.mk b/mirror/ubuntu/createchroot.mk index bd55bbc32..6abd497ee 100644 --- a/mirror/ubuntu/createchroot.mk +++ b/mirror/ubuntu/createchroot.mk @@ -16,8 +16,8 @@ $(BUILD_DIR)/mirror/ubuntu/createchroot.done: echo "suite=@@UBUNTU_RELEASE@@-updates" >> $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf; \ echo "omitdebsrc=true" >> $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf; \ fi - sed -i '' -e "s/@@UBUNTU_RELEASE@@/$(UBUNTU_RELEASE)/g" $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf - sed -i '' -e "s]@@MIRROR_UBUNTU@@]$(MIRROR_UBUNTU)]g" $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf + sed -i -e "s/@@UBUNTU_RELEASE@@/$(UBUNTU_RELEASE)/g" $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf + sed -i -e "s]@@MIRROR_UBUNTU@@]$(MIRROR_UBUNTU)]g" $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf mount | grep -q $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/proc || sudo mount -t proc none $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/proc sudo multistrap -a amd64 -f $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/multistrap.conf -d $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot sudo chroot $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot /bin/bash -c "dpkg --configure -a || exit 0" diff --git a/packages/openstack/rpm/module.mk b/packages/openstack/rpm/module.mk index 40d813e5d..e98054d7d 100644 --- a/packages/openstack/rpm/module.mk +++ b/packages/openstack/rpm/module.mk @@ -62,7 +62,7 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \ sudo cp $(BUILD_DIR)/openstack/rpm/sources/$1/*.tar.gz $$(SANDBOX)/tmp/SOURCES/ sudo cp -r $(BUILD_DIR)/repos/$1-build/rpm/SOURCES/* $$(SANDBOX)/tmp/SOURCES sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/*.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec - sed -i '' "s/Source0:.*/Source0:\t$1-`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`\.tar\.gz/" $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec + sed -i "s/Source0:.*/Source0:\t$1-`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`\.tar\.gz/" $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec sudo cp $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec $$(SANDBOX)/tmp/ sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -bs /tmp/openstack-$1.spec sudo sh -c "$$$${INSTALL_CENTOS_REPO}" diff --git a/repos.mk b/repos.mk index c85591ef0..db85db3de 100644 --- a/repos.mk +++ b/repos.mk @@ -3,7 +3,7 @@ repos: $(BUILD_DIR)/repos/repos.done $(BUILD_DIR)/repos/repos.done: - sed -i '' '/^ fuelmain_sha:/d' $(BUILD_DIR)/repos/version.yaml + sed -i '/^ fuelmain_sha:/d' $(BUILD_DIR)/repos/version.yaml /bin/echo " fuelmain_sha: \"`git rev-parse --verify HEAD`\"" >> $(BUILD_DIR)/repos/version.yaml $(ACTION.TOUCH) @@ -25,7 +25,7 @@ $(BUILD_DIR)/repos/$1.done: ) # Update versions.yaml touch $(BUILD_DIR)/repos/version.yaml - sed -i '' '/^ $1_sha:/d' $(BUILD_DIR)/repos/version.yaml + sed -i '/^ $1_sha:/d' $(BUILD_DIR)/repos/version.yaml /bin/echo " $1_sha: \"`cd $(BUILD_DIR)/repos/$1 && git rev-parse --verify HEAD`\"" >> $(BUILD_DIR)/repos/version.yaml touch $(BUILD_DIR)/repos/$1.done endef