upd README and docbook
This commit is contained in:
parent
a8e8ba6039
commit
dafd48a413
2 changed files with 27 additions and 14 deletions
33
README.md
33
README.md
|
@ -108,11 +108,18 @@ overriding
|
||||||
# the server user
|
# the server user
|
||||||
# account=[SetUser]
|
# account=[SetUser]
|
||||||
|
|
||||||
|
# Set to 'true' to use ssh-agent to store passphrase.
|
||||||
|
# ssh_agent=false
|
||||||
|
|
||||||
|
# use alternative storage server (one or the other might be more stable)
|
||||||
|
# alt_storage=false
|
||||||
|
|
||||||
# the server project: manjaro|manjaro-community
|
# the server project: manjaro|manjaro-community
|
||||||
|
# determined automatically based on profile if unset
|
||||||
# project="[SetProject]"
|
# project="[SetProject]"
|
||||||
|
|
||||||
# set upload bandwidth limit in kB/s
|
# set upload bandwidth limit in kB/s
|
||||||
# limit=100
|
# limit=
|
||||||
|
|
||||||
# the torrent tracker urls, comma separated
|
# the torrent tracker urls, comma separated
|
||||||
# tracker_url='udp://mirror.strits.dk:6969'
|
# tracker_url='udp://mirror.strits.dk:6969'
|
||||||
|
@ -168,14 +175,14 @@ The arch can also be set in manjaro-tools.conf, but under normal conditions, it
|
||||||
* Removes the chroot dir
|
* Removes the chroot dir
|
||||||
* If the -c parameter is not used, buildpkg will update the existing chroot or create a new one if none is present.
|
* If the -c parameter is not used, buildpkg will update the existing chroot or create a new one if none is present.
|
||||||
|
|
||||||
###### * -w
|
###### * -n
|
||||||
* Cleans pkgcache, and logfiles
|
* Installs the built package in the chroot and runs a namcap check
|
||||||
|
|
||||||
###### * -s
|
###### * -s
|
||||||
* Signs the package when built
|
* Signs the package when built
|
||||||
|
|
||||||
###### * -n
|
###### * -w
|
||||||
* Installs the built package in the chroot and runs a namcap check
|
* Cleans pkgcache, and logfiles
|
||||||
|
|
||||||
### 3. buildiso
|
### 3. buildiso
|
||||||
|
|
||||||
|
@ -340,21 +347,19 @@ manjaro-chroot /mnt /bin/bash
|
||||||
|
|
||||||
### 7. deployiso
|
### 7. deployiso
|
||||||
|
|
||||||
deployiso is a script to upload a specific iso or a buiildset to SF.
|
deployiso is a script to upload a specific iso or a buiildset to OSDN.
|
||||||
It needs to be run inside the iso-profiles directory.
|
|
||||||
|
|
||||||
Ideally, you have a running ssh agent on the host, and your key added, and your public key provided to your SF account. You can then upload without being asked for ssh password.
|
|
||||||
|
|
||||||
#### Arguments
|
#### Arguments
|
||||||
|
|
||||||
~~~
|
~~~
|
||||||
$ deployiso -h
|
$ deployiso -h
|
||||||
Usage: deployiso [options]
|
Usage: deployiso [options]
|
||||||
-c Create new remote release directory
|
-d Use hidden remote directory
|
||||||
-h This help
|
-h This help
|
||||||
-l Limit bandwidth in kB/s [default:80]
|
-l Limit bandwidth in kB/s [default:]
|
||||||
-p Source folder to upload [default:default]
|
-p Source folder to upload [default:default]
|
||||||
-q Query settings and pretend upload
|
-q Query settings and pretend upload
|
||||||
|
-s Sign ISO and create checksums
|
||||||
-t Create iso torrent
|
-t Create iso torrent
|
||||||
-u Update remote directory
|
-u Update remote directory
|
||||||
-v Verbose output
|
-v Verbose output
|
||||||
|
@ -363,11 +368,11 @@ Usage: deployiso [options]
|
||||||
###### * upload official build list, ie all built iso defined in a build list
|
###### * upload official build list, ie all built iso defined in a build list
|
||||||
|
|
||||||
~~~
|
~~~
|
||||||
deployiso -p official -c
|
deployiso -p official
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
###### * upload xfce
|
###### * upload sign xfce ISO file, create checksums, create torrent and upload to hidden directory
|
||||||
|
|
||||||
~~~
|
~~~
|
||||||
deployiso -p xfce -c
|
deployiso -p xfce -std
|
||||||
~~~
|
~~~
|
||||||
|
|
|
@ -232,6 +232,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||||
</para></listitem>
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>ssh_agent=true|false</varname></term>
|
||||||
|
|
||||||
|
<listitem><para>When set true, the ssh-agent will be used to store
|
||||||
|
the passphrase.
|
||||||
|
</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>alt_storage=true|false</varname></term>
|
<term><varname>alt_storage=true|false</varname></term>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue