Commit graph

4195 commits

Author SHA1 Message Date
Nico Schottelius
cb648fce33 Merge branches 'install_integration' and 'preos' into 4.0-pre-not-stable 2014-01-21 17:17:29 +01:00
Nico Schottelius
26fcbbb4ef Merge branch 'master' into install_integration 2014-01-21 17:17:20 +01:00
Nico Schottelius
5f79efb201 Merge branch 'master' into preos 2014-01-21 16:46:22 +01:00
Nico Schottelius
520bcc29a7 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:43:02 +01:00
Nico Schottelius
51c9662475 DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:41:34 +01:00
Nico Schottelius
d89cdbae0a Merge branch 'master' into preos 2014-01-21 16:05:03 +01:00
Nico Schottelius
ba0c56efbd Merge branch 'master' into 4.0-pre-not-stable 2014-01-21 14:05:44 +01:00
Nico Schottelius
6746ba8279 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 09:16:45 +01:00
Daniel Heule
64f4cff3cb Shell selection support via ENV
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
2014-01-20 20:30:37 +01:00
Nico Schottelius
4bd6158260 add log from today
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 16:19:41 +01:00
Nico Schottelius
295c21b4e9 Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:58:55 +01:00
Nico Schottelius
7eabdc3cf9 ignore pypi-release marker
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:56:41 +01:00
Nico Schottelius
8ed5f85f9d do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:56:19 +01:00
Nico Schottelius
5a0a3971b0 do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:48:05 +01:00
Nico Schottelius
a3c5d32a54 fix building manpage of __install_partition_msdos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:45:42 +01:00
Nico Schottelius
7fb322c83c Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:43:56 +01:00
Nico Schottelius
f034ed6027 do not merge, if not coming from the master branch
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:43:48 +01:00
Nico Schottelius
131ee68aed Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:41:07 +01:00
Nico Schottelius
e40fde92fc allow releases from non-master branch, if the person knows what he does
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:40:54 +01:00
Nico Schottelius
3ca911dbc6 integrate install and preos support
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:37:50 +01:00
Nico Schottelius
2388188fbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-01-20 14:28:49 +01:00
Nico Schottelius
7988b3f8b9 Merge branch 'master' into preos 2014-01-20 14:28:37 +01:00
Nico Schottelius
c16d542da4 Merge branch 'master' into install_integration 2014-01-20 14:28:29 +01:00
Nico Schottelius
f7c4437873 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:27:26 +01:00
Nico Schottelius
b6bae508a8 use hostnamectl, if available, else use /etc/hostname and hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:26:22 +01:00
Nico Schottelius
8d5357107b use uname -n in hostname explorer
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:07:31 +01:00
Nico Schottelius
cd6abf379a allow hostname -f to fail and return empty output
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:52:49 +01:00
Nico Schottelius
9123940255 port selection of first part into gencode-remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:51:48 +01:00
Nico Schottelius
29d4f910bc do not change parameters
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:50:42 +01:00
Nico Schottelius
5279b7239c import __hostname - Thanks, Steven!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:47:45 +01:00
Nico Schottelius
13001924c0 do not touch a visible file during release process
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:52:28 +01:00
Nico Schottelius
c790014cd5 add scaled version of the cdist logo
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:11:23 +01:00
Nico Schottelius
b4644c9c2e add readme / warning for 4.x series
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:08:46 +01:00
Nico Schottelius
e463f84333 add changelog for 4.x cdist series
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:04:42 +01:00
Nico Schottelius
f3bf1b3ea1 merge preos and install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:47:45 +01:00
Nico Schottelius
4cfedb1787 +curl
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:42:53 +01:00
Nico Schottelius
b125c0a4f2 create output directory, if it does not exist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:21:50 +01:00
Nico Schottelius
55f26cbe25 - ' '
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:06:02 +01:00
Nico Schottelius
79cfdf578d remove obsolete '--additional-manifest' parameter
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:01:04 +01:00
Nico Schottelius
c3f79277b2 add some more packages for preos - fixes #267
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 08:50:41 +01:00
Nico Schottelius
f89a720cd2 Merge branch 'master' into preos 2014-01-20 08:48:44 +01:00
Nico Schottelius
ebc84859fc Merge branch 'master' into install_integration 2014-01-19 23:30:13 +01:00
Nico Schottelius
c47abb6af7 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:29:56 +01:00
Nico Schottelius
300af0b1cf Merge branch 'master' into install_integration 2014-01-19 23:28:52 +01:00
Nico Schottelius
ac0c88fe9f remove some old typos and omit type details that follow anyway
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:28:45 +01:00
Nico Schottelius
5858ebda53 Merge branch 'master' into install_integration 2014-01-19 23:22:53 +01:00
Nico Schottelius
ce73cef457 explain that a requirement caused the error, otherwise you search until you die
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:22:48 +01:00
Nico Schottelius
bf7427e937 Merge branch 'master' into install_integration 2014-01-19 22:11:45 +01:00
Nico Schottelius
f3b7fc1514 release 3.0.2
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 21:38:38 +01:00
Nico Schottelius
f3ab45d9ff Merge branch 'master' into install_integration 2014-01-19 19:44:40 +01:00