Merge pull request #3 from pfeerick/patch-1

Add root check and install dependencies
ayufan-rock64 · Jun 28, 2017 · 9c6a1a5 · 9c6a1a5
2 parents a0c07c3 + 3d19d43
commit 9c6a1a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -30,6 +30,8 @@ linux-rock64-package-$(RELEASE_NAME).deb: package
 		--deb-compression bzip2 \
 		--after-install package/scripts/postinst.deb \
 		--before-remove package/scripts/prerm.deb \
+		--depends gdisk \
+		--depends parted \
 		--url https://gitlab.com/ayufan-rock64/linux-build \
 		--description "Rock64 Linux support package" \
 		--config-files /boot/extlinux/ \

diff --git a/package/root/usr/local/sbin/resize_rootfs.sh b/package/root/usr/local/sbin/resize_rootfs.sh
@@ -2,6 +2,11 @@
 
 set -xe
 
+if [ "$(id -u)" -ne "0" ]; then
+	echo "This script requires root."
+	exit 1
+fi
+
 gdisk /dev/mmcblk0 <<EOF
 x
 e

diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh
@@ -156,7 +156,8 @@ export DEBIAN_FRONTEND=noninteractive
 locale-gen en_US.UTF-8
 apt-get -y update
 apt-get -y install dosfstools curl xz-utils iw rfkill wpasupplicant openssh-server alsa-utils \
-	nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr
+	nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr \
+	gdisk parted
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BF428671
 if [[ "$DISTRO" == "jessie" ]]; then
 	REPO=xenial
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,11 @@ @@
     set -xe
+    if [ "$(id -u)" -ne "0" ]; then
+    	echo "This script requires root."
+    	exit 1
+    fi
     gdisk /dev/mmcblk0 <<EOF
     x
     e
@@ Expand Down @@