iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[automated-distro-installer]
/
fai
/
config
/
class
/
10-base-classes
diff --git
a/fai/config/class/10-base-classes
b/fai/config/class/10-base-classes
index eed0846e2e8f47971a78361847abc0f6280cc1d6..d312a50fcb74f447a6d0b63d2da654686fb1107c 100755
(executable)
--- a/
fai/config/class/10-base-classes
+++ b/
fai/config/class/10-base-classes
@@
-1,8
+1,13
@@
#! /bin/bash
#! /bin/bash
+# do only execute if this is called on the client being installed. Do not use during fai-diskimage
+if [ X$FAI_ACTION = Xinstall -a $do_init_tasks -eq 0 ]; then
+ exit 0
+fi
+
# Echo architecture and OS name in uppercase. Do NOT remove these two lines.
uname -s | tr '[:lower:]' '[:upper:]'
# Echo architecture and OS name in uppercase. Do NOT remove these two lines.
uname -s | tr '[:lower:]' '[:upper:]'
-
[ -x "`which dpkg`" ]
&& dpkg --print-architecture | tr a-z A-Z
+
command -v dpkg >&/dev/null
&& dpkg --print-architecture | tr a-z A-Z
# determin if we are a DHCP client or not
# count the : chars in the argument of ip=
# determin if we are a DHCP client or not
# count the : chars in the argument of ip=