Merge pull request #306 from lin755/centos-bugfix

use git fetch to replace git pull
open-estuary · Dec 18, 2018 · eabd403 · eabd403
2 parents 12cc11d + b3a46b1
commit eabd403
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/build.sh b/build.sh
@@ -264,7 +264,7 @@ for module in $module_name; do
             fi
         done
     else
-        (cd ${module} ; git pull || true)
+        (cd ${module} ; git fetch origin ${version} || true)
     fi
     cd ${top_dir}
     if [ x"$module" = x"estuary-uefi" ]; then

diff --git a/configs/auto-install/centos/auto-iso/ks-iso.cfg b/configs/auto-install/centos/auto-iso/ks-iso.cfg
@@ -1,4 +1,4 @@
-network  --bootproto=dhcp --device=eth0 --ipv6=auto --no-activate
+network  --bootproto=dhcp --onboot=yes --ipv6=auto --activate
 
 %packages
 bash-completion
@@ -14,14 +14,15 @@ name=Estuary
 baseurl=${estuary_release}/5.0/centos/
 enabled=1
 gpgcheck=1
+gpgkey=${estuary_release}/ESTUARY-GPG-KEY
 
 [estuary-kernel]
 name=estuary-kernel
 baseurl=${estuary_release}/5.2/centos/
 enabled=1
 gpgcheck=1
+gpgkey=${estuary_release}/ESTUARY-GPG-KEY
 EOF
 chmod +r /etc/yum.repos.d/estuary.repo
-rpm --import ${estuary_release}/ESTUARY-GPG-KEY
 yum clean dbcache
 %end
diff --git a/configs/auto-install/centos/auto-pxe/ks.cfg b/configs/auto-install/centos/auto-pxe/ks.cfg
@@ -1,9 +1,7 @@
 url --url="http://mirror.centos.org/altarch/7/os/aarch64/"
 repo --name="estuary" --baseurl=ftp://repoftp:repopushez7411@117.78.41.188/releases/5.2/centos
 repo --name="extras" --baseurl="http://mirror.centos.org/altarch/7/extras/aarch64/"
-network  --bootproto=dhcp --device=eth0 --ipv6=auto --no-activate
-
-
+network  --bootproto=dhcp --onboot=yes --ipv6=auto --activate
 
 %packages
 bash-completion
@@ -19,14 +17,15 @@ name=Estuary
 baseurl=${estuary_release}/5.0/centos/
 enabled=1
 gpgcheck=1
+gpgkey=${estuary_release}/ESTUARY-GPG-KEY
 
 [estuary-kernel]
 name=estuary-kernel
 baseurl=${estuary_release}/5.2/centos/
 enabled=1
 gpgcheck=1
+gpgkey=${estuary_release}/ESTUARY-GPG-KEY
 EOF
 chmod +r /etc/yum.repos.d/estuary.repo
-rpm --import ${estuary_release}/ESTUARY-GPG-KEY
 yum clean dbcache
 %end
diff --git a/submodules/centos-build-iso.sh b/submodules/centos-build-iso.sh
@@ -28,9 +28,6 @@ if [ ! -f $ISO ] || ! check_sum . ${ISO}.sum; then
     check_sum . ${ISO}.sum || exit 1
 fi
 
-# Create a working directory for your customized media.
-mkdir -p ${dest_dir}/temp
-
 # Copy the source media to the working directory.
 xorriso -osirrox on -indev ${ISO} -extract / ${dest_dir}
 
@@ -103,6 +100,6 @@ if [ x"$build_kernel" != x"true" ]; then
         EFI/BOOT=${dest_dir}/EFI/BOOT \
         images/efiboot.img=${dest_dir}/images/efiboot.img
     cd ${dest_dir}
-    rm -rf Packages repodata temp
+    rm -rf Packages repodata
     tar -cf - . | pigz > ${out}/centos-netboot-${version}.tar.gz
 fi
diff --git a/submodules/debian-build-installer.sh b/submodules/debian-build-installer.sh
@@ -87,6 +87,7 @@ d-i anna/no_kernel_modules boolean true
 
 # Skip linux-image-arm64 installation
 d-i base-installer/kernel/image string none
+d-i preseed/late_command string in-target apt-get remove -y apparmor
 
 EOF