kotovalexarian/raspberrypi-build
Archived
1
0
Fork 0
Code Activity

Common umount

Browse source
This commit is contained in:
Braiden Vasco 2017-07-03 11:19:35 +00:00
parent 1e3f6d8053
commit 5d384aceb6
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.sh
View file

@ -152,6 +152,7 @@ if [ ! -d "$ROOTFS_DIR" ]; then
http://mirrordirector.raspbian.org/raspbian/" || rmdir "$ROOTFS_DIR/debootstrap" http://mirrordirector.raspbian.org/raspbian/" || rmdir "$ROOTFS_DIR/debootstrap"
fi fi
unmount "$ROOTFS_DIR"
mount --bind /dev "$ROOTFS_DIR/dev" mount --bind /dev "$ROOTFS_DIR/dev"
mount --bind /dev/pts "$ROOTFS_DIR/dev/pts" mount --bind /dev/pts "$ROOTFS_DIR/dev/pts"
mount -t proc /proc "$ROOTFS_DIR/proc" mount -t proc /proc "$ROOTFS_DIR/proc"
@ -326,13 +327,8 @@ EOF
install -v -d "$ROOTFS_DIR/etc/systemd/system/dhcpcd.service.d" install -v -d "$ROOTFS_DIR/etc/systemd/system/dhcpcd.service.d"
umount "$ROOTFS_DIR/sys" unmount "$ROOTFS_DIR"
umount "$ROOTFS_DIR/proc"
umount "$ROOTFS_DIR/dev/pts"
umount "$ROOTFS_DIR/dev"
unmount_image "$IMG_FILE" unmount_image "$IMG_FILE"
rm -f "$IMG_FILE" rm -f "$IMG_FILE"
BOOT_SIZE=$(du --apparent-size -s "$ROOTFS_DIR/boot" --block-size=1 | cut -f 1) BOOT_SIZE=$(du --apparent-size -s "$ROOTFS_DIR/boot" --block-size=1 | cut -f 1)
@ -387,6 +383,7 @@ mount -v $BOOT_DEV "$MOUNT_DIR/boot" -t vfat
rsync -aHAXx --exclude var/cache/apt/archives "$ROOTFS_DIR/" "$MOUNT_DIR/" rsync -aHAXx --exclude var/cache/apt/archives "$ROOTFS_DIR/" "$MOUNT_DIR/"
unmount "$MOUNT_DIR"
mount --bind /dev "$MOUNT_DIR/dev" mount --bind /dev "$MOUNT_DIR/dev"
mount --bind /dev/pts "$MOUNT_DIR/dev/pts" mount --bind /dev/pts "$MOUNT_DIR/dev/pts"
mount -t proc /proc "$MOUNT_DIR/proc" mount -t proc /proc "$MOUNT_DIR/proc"
@ -453,20 +450,13 @@ chroot_mount 'fake-hwclock save'
# Allow services to start. # Allow services to start.
rm -f "$MOUNT_DIR/usr/sbin/policy-rc.d" rm -f "$MOUNT_DIR/usr/sbin/policy-rc.d"
umount "$MOUNT_DIR/sys"
umount "$MOUNT_DIR/proc"
umount "$MOUNT_DIR/dev/pts"
umount "$MOUNT_DIR/dev"
ROOT_DEV=$(mount | grep "$MOUNT_DIR " | cut -f1 -d ' ') ROOT_DEV=$(mount | grep "$MOUNT_DIR " | cut -f1 -d ' ')
unmount "$MOUNT_DIR" unmount "$MOUNT_DIR"
zerofree -v "$ROOT_DEV" zerofree -v "$ROOT_DEV"
unmount_image "$IMG_FILE" unmount_image "$IMG_FILE"
rm -f "$ZIP_FILE" rm -f "$ZIP_FILE"
pushd $(dirname "$IMG_FILE") > /dev/null pushd $(dirname "$IMG_FILE") > /dev/null
zip "$ZIP_FILE" $(basename "$IMG_FILE") zip "$ZIP_FILE" $(basename "$IMG_FILE")
popd > /dev/null popd > /dev/null