Selaa lähdekoodia

utils setup sequence

Bob Mottram 7 vuotta sitten
vanhempi
commit
dfda824730
2 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 6
    5
      src/freedombone-image-customise
  2. 0
    1
      src/freedombone-utils-setup

+ 6
- 5
src/freedombone-image-customise Näytä tiedosto

@@ -1020,6 +1020,12 @@ function image_setup_utils {
1020 1020
     if [ $INSTALLING_MESH ]; then
1021 1021
         return
1022 1022
     fi
1023
+    chroot "$rootdir" apt-get -yq install apt-transport-https
1024
+    chroot "$rootdir" apt-get -yq remove --purge apache*
1025
+    chroot "$rootdir" apt-get -yq dist-upgrade
1026
+    chroot "$rootdir" apt-get -yq install ca-certificates
1027
+    chroot "$rootdir" apt-get -yq install apt-utils
1028
+    chroot "$rootdir" apt-get -yq install awk libdebconfclient0 libbz2-1.0
1023 1029
     chroot "$rootdir" apt-get -yq install nfs-kernel-server
1024 1030
 
1025 1031
     if [[ $ARCHITECTURE == 'amd64' ]]; then
@@ -1047,11 +1053,6 @@ function image_setup_utils {
1047 1053
     rm $rootdir/root/sysctl.conf
1048 1054
 
1049 1055
     # all the packages
1050
-    chroot "$rootdir" apt-get -yq install apt-transport-https
1051
-    chroot "$rootdir" apt-get -yq remove --purge apache*
1052
-    chroot "$rootdir" apt-get -yq dist-upgrade
1053
-    chroot "$rootdir" apt-get -yq install ca-certificates
1054
-    chroot "$rootdir" apt-get -yq install apt-utils
1055 1056
     chroot "$rootdir" apt-get -yq install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon
1056 1057
     chroot "$rootdir" apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server
1057 1058
     chroot "$rootdir" apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils

+ 0
- 1
src/freedombone-utils-setup Näytä tiedosto

@@ -213,7 +213,6 @@ function initial_setup {
213 213
     apt-get -yq dist-upgrade
214 214
     apt-get -yq install ca-certificates
215 215
     apt-get -yq install apt-utils
216
-    apt-get -yq install awk
217 216
     apt-get -yq install cryptsetup libgfshare-bin obnam sshpass wget avahi-daemon
218 217
     apt-get -yq install avahi-utils avahi-discover connect-proxy openssh-server
219 218
     apt-get -yq install sudo git dialog build-essential avahi-daemon avahi-utils