From 09aa4b01295fc3bf4c9e2e5887367ffce9de0137 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Thu, 21 Jan 2016 21:49:11 +0300 Subject: [PATCH] Removed small code duplication --- debootstrap-ng.sh | 3 --- debootstrap.sh | 3 --- distributions.sh | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index 7e1635180b..d31b09e911 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -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/ diff --git a/debootstrap.sh b/debootstrap.sh index 37687f0b4e..2835e96d18 100644 --- a/debootstrap.sh +++ b/debootstrap.sh @@ -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 diff --git a/distributions.sh b/distributions.sh index 81e31c6d0b..11a50b5ca0 100644 --- a/distributions.sh +++ b/distributions.sh @@ -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" } \ No newline at end of file