This commit is contained in:
Bob Mottram 2017-06-27 12:33:43 +01:00
parent e634287f32
commit 8e561667c1
2 changed files with 3 additions and 3 deletions

View File

@ -1045,7 +1045,7 @@ function image_setup_utils {
fi fi
if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
chroot "$rootdir" apt-get -yq install grub2 chroot "$rootdir" apt-get -yq install grub2 lvm2
fi fi
chroot "$rootdir" apt-get -yq install locales locales-all debconf chroot "$rootdir" apt-get -yq install locales locales-all debconf
@ -1356,7 +1356,7 @@ chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-nam
chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils
if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then
chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc
chroot "$rootdir" apt-get install -y grub2 hostapd chroot "$rootdir" apt-get install -y grub2 hostapd lvm2
fi fi
sed -i "s|#host-name=.*|host-name=${LOCAL_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf sed -i "s|#host-name=.*|host-name=${LOCAL_NAME}|g" $rootdir/etc/avahi/avahi-daemon.conf

View File

@ -235,7 +235,7 @@ function initial_setup {
apt-get -yq install cpulimit screen apt-get -yq install cpulimit screen
if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
apt-get -yq install grub2 apt-get -yq install grub2 lvm2
fi fi
if [ ! -d $INSTALL_DIR ]; then if [ ! -d $INSTALL_DIR ]; then