Merge remote-tracking branch 'sans/master'
Conflicts: doc/changelog Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
commit
1480cafac5
2 changed files with 2 additions and 3 deletions
|
@ -26,7 +26,7 @@
|
|||
# set -x
|
||||
|
||||
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
|
||||
|
@ -46,7 +46,7 @@ state="$(cat "$__object/parameter/state")"
|
|||
pkg_version="$(cat "$__object/explorer/pkg_version")"
|
||||
|
||||
# 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
|
||||
installed)
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
* Renamed explorer: hardware_type to machine
|
||||
* Core: Do not execute empty code fragments
|
||||
|
||||
|
||||
1.6.2: 2011-04-19
|
||||
* Core: Introduce __cdist_tmp_base_dir
|
||||
* Core: Cleanup and enhance cdist-type-template
|
||||
|
|
Loading…
Reference in a new issue