Alon Bar-Lev has uploaded a new change for review. Change subject: utils: osinfo: do not use absolute paths ......................................................................
utils: osinfo: do not use absolute paths Project should always used build time customization for all paths. This enables working at devenv mode and at different distributions and settings. Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1030500 Change-Id: I51be14104b73214602c491383fde6b34ef4f094c Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java M packaging/conf/osinfo-defaults.properties 2 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/22383/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java index 5ee0af5..16a1d7c 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java @@ -346,7 +346,7 @@ @Override public String getSysprepPath(int osId, Version version) { - return getValueByVersion(idToUnameLookup.get(osId), "sysprepPath", version); + return EngineLocalConfig.getInstance().expandString(getValueByVersion(idToUnameLookup.get(osId), "sysprepPath", version)); } @Override diff --git a/packaging/conf/osinfo-defaults.properties b/packaging/conf/osinfo-defaults.properties index 7ec78d4..d3d2b0d 100644 --- a/packaging/conf/osinfo-defaults.properties +++ b/packaging/conf/osinfo-defaults.properties @@ -127,7 +127,7 @@ os.windows_xp.id.value = 1 os.windows_xp.name.value = Windows XP os.windows_xp.derivedFrom.value = other -os.windows_xp.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.xp +os.windows_xp.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.xp os.windows_xp.productKey.value = os.windows_xp.isTimezoneTypeInteger.value = true os.windows_xp.devices.network.value = rtl8139_pv, rtl8139, e1000, pv @@ -141,7 +141,7 @@ os.windows_2003.id.value = 3 os.windows_2003.name.value = Windows 2003 os.windows_2003.derivedFrom.value = windows_xp -os.windows_2003.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k3 +os.windows_2003.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.2k3 os.windows_2003.productKey.value = os.windows_2003.isTimezoneTypeInteger.value = true os.windows_2003.devices.audio.value = ac97 @@ -152,7 +152,7 @@ os.windows_2008.id.value = 4 os.windows_2008.name.value = Windows 2008 os.windows_2008.derivedFrom.value = windows_2003 -os.windows_2008.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k8 +os.windows_2008.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.2k8 os.windows_2008.productKey.value = # Windows2003x64(10, OsType.Windows, true), @@ -161,7 +161,7 @@ os.windows_2003x64.derivedFrom.value = windows_2003 os.windows_2003x64.bus.value = 64 os.windows_2003x64.resources.minimum.ram.value = 1024 -os.windows_2003x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k3 +os.windows_2003x64.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.2k3 os.windows_2003x64.productKey.value = os.windows_2003x64.isTimezoneTypeInteger.value = true @@ -169,7 +169,7 @@ os.windows_7.id.value = 11 os.windows_7.name.value = Windows 7 os.windows_7.derivedFrom.value = windows_xp -os.windows_7.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.w7 +os.windows_7.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.w7 os.windows_7.productKey.value = os.windows_7.devices.audio.value = ich6 os.windows_7.devices.diskInterfaces.value.3.3 = IDE, VirtIO_SCSI, VirtIO @@ -180,14 +180,14 @@ os.windows_7x64.bus.value = 64 os.windows_7x64.derivedFrom.value = windows_7 os.windows_7x64.resources.minimum.ram.value = 1024 -os.windows_7x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.w7x64 +os.windows_7x64.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.w7x64 os.windows_7x64.productKey.value = # Windows2008x64(16, OsType.Windows, true), os.windows_2008x64.id.value = 16 os.windows_2008x64.name.value = Windows 2008 x64 os.windows_2008x64.derivedFrom.value = windows_2003x64 -os.windows_2008x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k8x64 +os.windows_2008x64.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.2k8x64 os.windows_2008x64.productKey.value = os.windows_2008x64.devices.audio.value = ich6 @@ -202,7 +202,7 @@ os.windows_8.id.value = 20 os.windows_8.name.value = Windows 8 os.windows_8.derivedFrom.value = windows_7 -os.windows_8.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.w8 +os.windows_8.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.w8 os.windows_8.productKey.value = os.windows_8.displayProtocols.value = vnc/cirrus @@ -211,7 +211,7 @@ os.windows_8x64.name.value = Windows 8 x64 os.windows_8x64.bus.value = 64 os.windows_8x64.derivedFrom.value = windows_7x64 -os.windows_8x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.w8x64 +os.windows_8x64.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.w8x64 os.windows_8x64.productKey.value = os.windows_8x64.displayProtocols.value = vnc/cirrus @@ -219,7 +219,7 @@ os.windows_2012x64.id.value = 23 os.windows_2012x64.name.value = Windows 2012 x64 os.windows_2012x64.derivedFrom.value = windows_2008x64 -os.windows_2012x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k12x64 +os.windows_2012x64.sysprepPath.value = ${ENGINE_ETC}/sysprep/sysprep.2k12x64 os.windows_2012x64.productKey.value = os.windows_2012x64.displayProtocols.value = vnc/cirrus -- To view, visit http://gerrit.ovirt.org/22383 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51be14104b73214602c491383fde6b34ef4f094c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
