Removed small code duplication

This commit is contained in:
zador-blood-stained 2016-01-21 21:49:11 +03:00
parent 3a47c2fad5
commit 09aa4b0129
3 changed files with 3 additions and 6 deletions

View File

@ -482,9 +482,6 @@ create_image()
# stage: write u-boot
write_uboot $LOOP
# DEBUG: stage: final customizations
touch $DEST/cache/mount/root/.not_logged_in_yet
# unmount /boot first, rootfs second, image file last
if [[ $BOOTSIZE != 0 ]]; then umount -l $DEST/cache/mount/boot; fi
umount -l $DEST/cache/mount/

View File

@ -126,9 +126,6 @@ cp $SRC/lib/bin/armbian.key $DEST/cache/sdcard
chroot $DEST/cache/sdcard /bin/bash -c "cat armbian.key | apt-key add -"
rm $DEST/cache/sdcard/armbian.key
# display welcome message at first root login
touch $DEST/cache/sdcard/root/.not_logged_in_yet
# update and upgrade
LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y update" | dialog --progressbox "Updating package databases ..." 20 70

View File

@ -176,6 +176,9 @@ if [ -f /etc/bash.bashrc.custom ]; then
fi
END
# display welcome message at first root login
touch $DEST/cache/mount/root/.not_logged_in_yet
# remove hostapd because it's replaced with ours
chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y -qq remove hostapd >/dev/null 2>&1"
}