Merge pull request #243 from illfelder/development

Fix packaging on sysvinit.

9 files changed, 23 insertions, 17 deletions

diff --git a/google_compute_engine/metadata_scripts/script_manager.py b/google_compute_engine/metadata_scripts/script_manager.py
index 8c8752d..e59cfeb 100755
--- a/google_compute_engine/metadata_scripts/script_manager.py
+++ b/google_compute_engine/metadata_scripts/script_manager.py
@@ -17,8 +17,8 @@
 
 import contextlib
 import logging.handlers
+import optparse
 import shutil
-import sys
 import tempfile
 
 from google_compute_engine import config_manager
@@ -72,10 +72,14 @@ class ScriptManager(object):
         self.logger.info('Finished running %s scripts.', self.script_type)
 
 
-def main(args):
+def main():
   script_types = ('startup', 'shutdown')
-  if args and args[0].lower() in script_types:
-    script_type = args[0].lower()
+  parser = optparse.OptionParser()
+  parser.add_option('--script-type', dest='script_type',
+                    help='metadata script type.')
+  (options, _) = parser.parse_args()
+  if options.script_type and options.script_type.lower() in script_types:
+    script_type = options.script_type.lower()
   else:
     valid_args = ', '.join(script_types)
     message = 'No valid argument specified. Options: [%s].' % valid_args
@@ -87,4 +91,4 @@ def main(args):
 
 
 if __name__ == '__main__':
-  main(sys.argv[1:])
+  main()
diff --git a/package.sh b/package.sh
index 8a0db6b..4019dd0 100755
--- a/package.sh
+++ b/package.sh
@@ -31,18 +31,20 @@ function build_distro() {
   fi
 
   fpm \
-    -n "${name}" \
     -s python \
     -t "${pkg_type}" \
-    -m 'gc-team@google.com' \
+    --after-install "package/${init_config}/postinst.sh" \
+    --before-remove "package/${init_config}/prerm.sh" \
+    --depends 'python-boto' \
+    --depends 'python-pkg-resources' \
+    --iteration "0.$TIMESTAMP" \
+    --maintainer 'gc-team@google.com' \
+    --name "${name}" \
     --no-python-fix-name \
     --python-install-bin '/usr/bin' \
     --python-install-lib "$py_path" \
     --python-install-data "/usr/share/doc/${name}" \
     --rpm-dist "$distro" \
-    --after-install "package/${init_config}/postinst.sh" \
-    --before-remove "package/${init_config}/prerm.sh" \
-    --iteration "0.$TIMESTAMP" \
     setup.py
 }
 
diff --git a/package/systemd/google-shutdown-scripts.service b/package/systemd/google-shutdown-scripts.service
index 416d601..64f53ed 100644
--- a/package/systemd/google-shutdown-scripts.service
+++ b/package/systemd/google-shutdown-scripts.service
@@ -5,7 +5,7 @@ Wants=local-fs.target network-online.target network.target
 
 [Service]
 ExecStart=/bin/true
-ExecStop=/usr/bin/google_metadata_script_runner shutdown
+ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown
 Type=oneshot
 RemainAfterExit=true
 TimeoutStopSec=0
diff --git a/package/systemd/google-startup-scripts.service b/package/systemd/google-startup-scripts.service
index 47ea355..af05e15 100644
--- a/package/systemd/google-startup-scripts.service
+++ b/package/systemd/google-startup-scripts.service
@@ -4,7 +4,7 @@ After=local-fs.target network-online.target network.target google-instance-setup
 Wants=local-fs.target network-online.target network.target
 
 [Service]
-ExecStart=/usr/bin/google_metadata_script_runner startup
+ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
 KillMode=process
 Type=oneshot
 
diff --git a/package/sysvinit/google-shutdown-scripts b/package/sysvinit/google-shutdown-scripts
index e4a0581..223d10d 100755
--- a/package/sysvinit/google-shutdown-scripts
+++ b/package/sysvinit/google-shutdown-scripts
@@ -40,7 +40,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 do_start()
 {
-  /usr/bin/google_metadata_script_runner shutdown
+  /usr/bin/google_metadata_script_runner --script-type shutdown
 }
 
 case "$1" in
diff --git a/package/sysvinit/google-startup-scripts b/package/sysvinit/google-startup-scripts
index 928b233..07d7e04 100755
--- a/package/sysvinit/google-startup-scripts
+++ b/package/sysvinit/google-startup-scripts
@@ -40,7 +40,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 do_start()
 {
-  /usr/bin/google_metadata_script_runner startup
+  /usr/bin/google_metadata_script_runner --script-type startup
 }
 
 case "$1" in
diff --git a/package/upstart/google-shutdown-scripts.conf b/package/upstart/google-shutdown-scripts.conf
index 3bcf4b9..e6a9129 100644
--- a/package/upstart/google-shutdown-scripts.conf
+++ b/package/upstart/google-shutdown-scripts.conf
@@ -3,4 +3,4 @@ description "Runs a shutdown script from metadata."
 start on starting rc RUNLEVEL=[06]
 task
 
-exec /usr/bin/google_metadata_script_runner shutdown
+exec /usr/bin/google_metadata_script_runner --script-type shutdown
diff --git a/package/upstart/google-startup-scripts.conf b/package/upstart/google-startup-scripts.conf
index efb8b70..1ec393d 100644
--- a/package/upstart/google-startup-scripts.conf
+++ b/package/upstart/google-startup-scripts.conf
@@ -2,4 +2,4 @@
 description "Runs a startup script from metadata."
 start on google-instance-setup-ran
 
-exec /usr/bin/google_metadata_script_runner startup
+exec /usr/bin/google_metadata_script_runner --script-type startup
diff --git a/setup.py b/setup.py
index 896c856..689bc59 100755
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ setuptools.setup(
     data_files=data_files_dict.get(os.environ['CONFIG']),
     description='Google Compute Engine',
     include_package_data=True,
-    install_requires=['boto>=2.25.0'],
+    install_requires=['boto'],
     license='Apache Software License',
     long_description='Google Compute Engine guest environment.',
     name='google-compute-engine',