Merge pull request #1420 from shapeblue/injectsh-umaskfix

systemvm: preserve file permissions, set default umask- In injectkeys.sh which is used to inject new public keys everytime cloudstack
  starts; while copying files preserve the mode/ownership. This ensures the
  scripts have same mode bits as originally configured in the iso file
- The default umask of 0022 is set in Ubuntu and other packages. Set the same
  in case of CentOS startup scripts

cc @abhinandanprateek @wido @remibergsma @DaanHoogland @jburwell

* pr/1420:
  systemvm: set default umask 022 in injectkeys.sh

Signed-off-by: Will Stevens <williamstevens@gmail.com>
This commit is contained in:
Will Stevens 2016-04-21 16:29:51 -04:00
commit f9846f1785
3 changed files with 3 additions and 1 deletions

View File

@ -87,6 +87,7 @@ handle_pid_file() {
}
start() {
umask 0022
readpath=$(readlink -f $0)
source `dirname $readpath`/tomcat.sh
}

View File

@ -24,6 +24,7 @@ Description=CloudStack Management Server
After=syslog.target network.target
[Service]
UMask=0022
Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=cloudstack-management"

View File

@ -27,7 +27,7 @@ set -e
TMP=/tmp
MOUNTPATH=${HOME}/systemvm_mnt
TMPDIR=${TMP}/cloud/systemvm
umask 022
clean_up() {
$SUDO umount $MOUNTPATH