diff options
| author | Jonathan Bauer | 2013-11-25 17:21:33 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-11-25 17:21:33 +0100 |
| commit | 0da6fb2160a769d317d8d20d90c3a916988c4f4d (patch) | |
| tree | 37bfff9911fa2401250a29ce7691313da05f340a | |
| parent | [pam-freiburg] update to home directory structure: /home/user is now a (diff) | |
| parent | [busybox] openslx-busybox-config: Enabled CONFIG_FEATURE_GPT_LABEL (diff) | |
| download | tm-scripts-0da6fb2160a769d317d8d20d90c3a916988c4f4d.tar.gz tm-scripts-0da6fb2160a769d317d8d20d90c3a916988c4f4d.tar.xz tm-scripts-0da6fb2160a769d317d8d20d90c3a916988c4f4d.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | doc/setup_howto | 11 | ||||
| -rw-r--r-- | remote/modules/busybox/openslx-busybox-config | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/setup_howto b/doc/setup_howto index abc7e2bb..73226a39 100644 --- a/doc/setup_howto +++ b/doc/setup_howto @@ -88,7 +88,6 @@ Build addons (vmware etc.) # ./mltk remote debug -c -b (as always: -d -> debug when appropriate) - 7. Packaging When using the parameter 'server' either an IP adress or 'local' is expected. @@ -107,17 +106,17 @@ server machine via rsync. To facilitate this rsync-ing it may be wise to add the ssh key to the build machine (authorized_keys), as then no password has to be given when syncing from the server machine. -## Das würde ich für die Zukunft als Default annehmen. Das andere ist ja eher -## zum Testen in sehr kleinem Setup. So, remember to execute # ./mltk remote -n -on the build machine, if the build is going to by synchronized to a dedicated -server machine. +on the build machine, as the build is usually going to by synchronized to a +dedicated server machine. 7.1 Packaging locally (build and server machine are the same machine) -To package stages and addons (for example vmware), presuming the same machine +Even though the usual way to go is using dedicated machines to build and to +serve it is possible to package locally, e.g. for testing purposes. So, to +package stages and addons (for example vmware), presuming the same machine is used for building and serving: # ./mltk server local stage31 -e stage31 # ./mltk server local stage32 -e stage32 diff --git a/remote/modules/busybox/openslx-busybox-config b/remote/modules/busybox/openslx-busybox-config index c60e6cae..0f508f47 100644 --- a/remote/modules/busybox/openslx-busybox-config +++ b/remote/modules/busybox/openslx-busybox-config @@ -556,7 +556,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set +CONFIG_FEATURE_GPT_LABEL=y # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set CONFIG_FLOCK=y |