Skip to content

Commit

Permalink
modified: ts/build/packages/local-install/bin/local-install.sh
Browse files Browse the repository at this point in the history
	modified:   ts/build/packages/local-install/build/conf/S99local-install
  • Loading branch information
root committed Jul 5, 2018
1 parent c796a86 commit a6e7b24
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ts/build/packages/local-install/bin/local-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ downloadImage()
fi

# Count how many directories we need to ignore. -4 comes for 1 (by defaul so to speak), 2 for '//' in http:// and 1 for the last '/' after 'refind/'
# e.g. http://myserver/ts5.5/local-install/refind/' will result in 3 and thereby we will only get the directories inside the final path.
# Otherwise we would end up having the ts5.5/local-install/refind directory structure as well...
# e.g. http://myserver/ts6.1/local-install/refind/' will result in 3 and thereby we will only get the directories inside the final path.
# Otherwise we would end up having the ts6.1/local-install/refind directory structure as well...
cutDirsCount=$((`echo $LOCAL_INSTALL_URL | sed 's/[^/]//g' | wc -m` -3))

mkdir -p ${TMP_DIR}/image
Expand Down
8 changes: 4 additions & 4 deletions ts/build/packages/local-install/build/conf/S99local-install
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# You should copy the folders refind and syslinux from /build/boot-images
# to the web-server(s) "local-install" folder. The web-server(s) structure should
# contain the following files:
# /ts5.5/ [folder, this is the path for LOCAL_INSTALL_URL]
# /ts6.1/ [folder, this is the path for LOCAL_INSTALL_URL]
# local-install/ [folder]
# refind/ [folder]
# syslinux/
Expand All @@ -56,7 +56,7 @@
# *** this is where you normally place the thinstation.conf.xxx files if you include
# the package netfiles (highly recommended) and in build.conf have the parameters set to
# param basename thinstation
# param basepath ts5.5
# param basepath ts6.1
# param baseurl http://same url as LOCAL_INSTALL_URL or if you want to use the same
# server as the dhcp server set (must be within single quote like below)
# param baseurl 'http://${SERVER_IP}'
Expand Down Expand Up @@ -106,7 +106,7 @@
#
# LOCAL_INSTALL_TFTP_NOTIFY_PATH The full path on the TFTP-server where the <hostname>.version files
# will be uploaded to. The path must end with a slash ("/"),
# for example /ts5.5/client-versions/
# for example /ts6.1/client-versions/
#
#
# --- Recommendation for setting up a test envirionment before deploying a new image/version in production
Expand All @@ -116,7 +116,7 @@
#
#
#LOCAL_INSTALL_DEVICEREGEX='(sd[a-z]$)|(mmcblk[0-9]$)'
#LOCAL_INSTALL_URL=http://${SERVER_IP}/ts5.5/prod/
#LOCAL_INSTALL_URL=http://${SERVER_IP}/ts6.1/prod/
#LOCAL_INSTALL_TFTP_NOTIFY_PATH=/client-versions/
#STORAGE_PATH=/mnt/local-install/part2
#STORAGE_CONFIG1=/mnt/local-install/part2

0 comments on commit a6e7b24

Please sign in to comment.