Ensure backwards compatibility

Author: Jeff Frontz

bin/gbuild

@@ -46,6 +46,12 @@ def build_one_configuration(suite, arch, build_desc)
       ENV["LXC_SUITE"] = suite
   end
 
+  if ENV["USE_DOCKER"] and build_desc["distro"].eql? "centos"
+    ontarget_root_extra = "-w /root"
+  else
+    ontarget_root_extra = ""
+  end
+
   suitearch = "#{suite}-#{arch}"
 
   info "Stopping target if it is up"
@@ -73,7 +79,7 @@ def build_one_configuration(suite, arch, build_desc)
 
   system! "on-target true"
 
-  system! "on-target -u root tee -a /etc/sudoers.d/#{ENV['DISTRO'] || 'ubuntu'} > /dev/null << EOF
+  system! "on-target -u root #{ontarget_root_extra} tee -a /etc/sudoers.d/#{ENV['DISTRO'] || 'ubuntu'} > /dev/null << EOF
 %#{ENV['DISTRO'] || 'ubuntu'} ALL=(ALL) NOPASSWD: ALL
 EOF" if build_desc["sudo"] and @options[:allow_sudo]
 
@@ -98,54 +104,54 @@ EOF" if build_desc["sudo"] and @options[:allow_sudo]
   if build_desc["multiarch"]
     info "Adding multiarch support (log in var/install.log)"
     for a in build_desc["multiarch"]
-      system! "on-target -u root dpkg --add-architecture #{a} >> var/install.log 2>&1"
+      system! "on-target -u root #{ontarget_root_extra} dpkg --add-architecture #{a} >> var/install.log 2>&1"
     end
   end
 
   case build_desc["distro"]
   when "centos"
     info "Updating yum repository (log in var/install.log)"
-    system! "on-target -u root -w /root yum -y makecache fast >> var/install.log 2>&1"
+    system! "on-target -u root #{ontarget_root_extra} yum -y makecache fast >> var/install.log 2>&1"
   else
     info "Updating apt-get repository (log in var/install.log)"
-    system! "on-target -u root apt-get update >> var/install.log 2>&1"
+    system! "on-target -u root #{ontarget_root_extra} apt-get update >> var/install.log 2>&1"
   end
 
   info "Installing additional packages (log in var/install.log)"
 
   case build_desc["distro"]
   when "centos"
-    system! "on-target -u root -w /root yum -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1"
+    system! "on-target -u root #{ontarget_root_extra} yum -y install #{build_desc["packages"].join(" ")} > var/install.log 2>&1"
   else
-    system! "on-target -u root -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} >> var/install.log 2>&1"
+    system! "on-target -u root #{ontarget_root_extra} -e DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y install #{build_desc["packages"].join(" ")} >> var/install.log 2>&1"
   end
 
   if build_desc["alternatives"]
     info "Set alternatives (log in var/install.log)"
     for a in build_desc["alternatives"]
-      system! "on-target -u root update-alternatives --set #{a["package"]} #{a["path"]} >> var/install.log 2>&1"
+      system! "on-target -u root #{ontarget_root_extra} update-alternatives --set #{a["package"]} #{a["path"]} >> var/install.log 2>&1"
     end
   end
 
-  if @options[:upgrade] || system("on-target -u root '[ ! -e /var/cache/gitian/initial-upgrade ]'")
+  if @options[:upgrade] || system("on-target -u root #{ontarget_root_extra} '[ ! -e /var/cache/gitian/initial-upgrade ]'")
       info "Upgrading system, may take a while (log in var/install.log)"
       case build_desc["distro"]
       when "centos"
-        system! "on-target -u root -w /root mkdir -p /var/cache/gitian"
-        system! "on-target -u root -w /root yum -y update > var/upgrade.log 2>&1"
+        system! "on-target -u root #{ontarget_root_extra} mkdir -p /var/cache/gitian"
+        system! "on-target -u root #{ontarget_root_extra} yum -y update > var/upgrade.log 2>&1"
         system! "copy-to-target #{@quiet_flag} var/upgrade.log /var/cache/gitian/upgrade.log"
-        system! "on-target -u root -w /root touch /var/cache/gitian/initial-upgrade"
+        system! "on-target -u root #{ontarget_root_extra} touch /var/cache/gitian/initial-upgrade"
       else
-        system! "on-target -u root bash < target-bin/upgrade-system.sh >> var/install.log 2>&1"
+        system! "on-target -u root #{ontarget_root_extra}  bash < target-bin/upgrade-system.sh >> var/install.log 2>&1"
       end
   end
   info "Creating package manifest"
 
   case build_desc["distro"]
   when "centos"
-    system! "on-target -u root -w /root yumdb get checksum_data | awk '/checksum_data =/ { print $3,  package; next } { package=$1 }' | sort --key 2 > var/base-#{suitearch}.manifest"
+    system! "on-target -u root #{ontarget_root_extra} yumdb get checksum_data | awk '/checksum_data =/ { print $3,  package; next } { package=$1 }' | sort --key 2 > var/base-#{suitearch}.manifest"
   else
-    system! "on-target -u root bash < target-bin/grab-packages.sh > var/base-#{suitearch}.manifest"
+    system! "on-target -u root #{ontarget_root_extra} bash < target-bin/grab-packages.sh > var/base-#{suitearch}.manifest"
   end
 
   info "Creating build script (var/build-script)"

libexec/on-target

@@ -31,12 +31,16 @@ if [ $# != 0 ] ; then
         shift 2
         ;;
       --workdir|-w)
-        # newer docker version is strict about non-default-user working dir
-        if docker exec -u root -w /root gitian-target true > /dev/null 2>&1
-        then
-            TWORKDIR="-w $2"
+        if [ -n "$USE_DOCKER" ]; then
+            if docker exec -u root -w /root gitian-target true > /dev/null 2>&1; then
+			# newer docker version is strict about non-default-user working dir
+                TWORKDIR="-w $2"
+            fi
+            shift 2
+        else
+            echo "unrecognized option $1"
+            exit 1
         fi
-        shift 2
         ;;
       --*)
         echo "unrecognized option $1"