Additional checks at puppet-enable and system-upgrade

diff --git a/share/hydractl/puppet-enable b/share/hydractl/puppet-enable
index b29603c6e83891837da9da28c5e951cb184768f2..bdb4455b80590b5ed4ec3e8346a27f89991f06d7 100755 (executable)
--- a/share/hydractl/puppet-enable
+++ b/share/hydractl/puppet-enable
@@ -35,9 +35,13 @@ fi
 
 # Business
 if [ "$BASENAME" == "puppet-enable" ]; then
-  $sudo sed -i -e 's/START=no/START=yes/' /etc/default/puppet
-  $sudo service puppet start
+  if [ -e "/etc/default/puppet" ]; then
+    $sudo sed -i -e 's/START=no/START=yes/' /etc/default/puppet
+    $sudo service puppet start
+  fi
 else
-  $sudo sed -i -e 's/START=yes/START=no/' /etc/default/puppet
-  $sudo service puppet stop
+  if [ -e "/etc/default/puppet" ]; then
+    $sudo sed -i -e 's/START=yes/START=no/' /etc/default/puppet
+    $sudo service puppet stop
+  fi
 fi

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index a8fd13ec57e62111c2e2c0556a1d34d7059a7a8c..374a3b0d3f4d49d436fe11a4534c5577ada52824 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -85,9 +85,12 @@ function hydra_system_upgrade_prepare {
   echo ""
   echo "Updating apt configuration..."
   sed -i -e "s/$release/$nextrelease/g" /etc/apt/sources.list
-  sed -i -e "s/$release/$nextrelease/g" /etc/apt/preferences
   sed -i -e 's|^deb http://backports.debian.org/debian-backports|#deb http://backports.debian.org/debian-backports|' /etc/apt/sources.list
 
+  if [ -e "/etc/apt/preferences" ]; then
+    sed -i -e "s/$release/$nextrelease/g" /etc/apt/preferences
+  fi
+
   # These will be generated by puppet and can be safely removed
   rm -f /etc/apt/sources.list.d/*
   rm -f /etc/apt/preferences.d/*