marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 Projects Releases Wiki Activity

Merge branch 'master' into split_into_modules

Browse source 
Conflicts:
	.gitignore

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-26 09:36:36 +02:00
commit c8dc4181f6
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conf/explorer/os
View file

@ -65,8 +65,13 @@ if [ -f /etc/SuSE-release ]; then
exit 0
fi
if uname -r | grep -s '.owl' >/dev/null 2>&1; then
echo owl
exit 0
fi
if [ -f /etc/cdist-preos ]; then
echo preos
echo cdist-preos
exit 0
fi