pedro/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'sans/master'

Browse source 
Conflicts:
	doc/changelog

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-04-29 10:39:52 +02:00
commit 1480cafac5
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/type/__package_pkg_openbsd/gencode-remote
View file

@ -26,7 +26,7 @@
# set -x # set -x
os_version="$(cat "$__global/explorer/os_version")" os_version="$(cat "$__global/explorer/os_version")"
hardware_type="$(cat "$__global/explorer/hardware_type")" machine="$(cat "$__global/explorer/machine")"
if [ -f "$__object/parameter/flavor" ]; then if [ -f "$__object/parameter/flavor" ]; then
@ -46,7 +46,7 @@ state="$(cat "$__object/parameter/state")"
pkg_version="$(cat "$__object/explorer/pkg_version")" pkg_version="$(cat "$__object/explorer/pkg_version")"
# TODO: Shouldn't be hardcoded # TODO: Shouldn't be hardcoded
echo export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$hardware_type/ echo export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$machine/
case "$state" in case "$state" in
installed) installed)

1
doc/changelog
View file

@ -5,7 +5,6 @@
* Renamed explorer: hardware_type to machine * Renamed explorer: hardware_type to machine
* Core: Do not execute empty code fragments * Core: Do not execute empty code fragments
1.6.2: 2011-04-19 1.6.2: 2011-04-19
* Core: Introduce __cdist_tmp_base_dir * Core: Introduce __cdist_tmp_base_dir
* Core: Cleanup and enhance cdist-type-template * Core: Cleanup and enhance cdist-type-template