Add sudo-enabled user support;Add Ubuntu 19.04;Update e2fsprogs;fix bugs

Author: zaoqi

Makefile

@@ -17,7 +17,7 @@ rootfs.ext4.base:
 menu.json: gen.menu.json.js
 	./gen.menu.json.js > menu.json
 
-extensions: chroot.shell.sh config.xml install.alpine.sh lib.sh LICENSE remove.sh resize.sh rootfs.ext3.base rootfs.ext4.base umount.sh menu.json mirror.china.sh
+extensions: *.sh config.xml LICENSE rootfs.ext3.base rootfs.ext4.base menu.json
 	rm -fr extensions
 	$(MAKE) -C ./e2fsprogs/
 	mkdir -p extensions/$(PACKAGE)

README.md

@@ -10,9 +10,18 @@
 
 `nodejs` `p7zip` `docker` and normal GNU/Linux
 
-## Build ZIP
+[you need to `sudo usermod -aG docker $(whoami)`](https://stackoverflow.com/questions/21871479/docker-cant-connect-to-docker-daemon)
+
+[Once you need to configure binfmt-support on your Docker host. This works locally or remotely (i.e using boot2docker or swarm).](https://github.com/multiarch/alpine)
 
+```bash
+# configure binfmt-support on the Docker host (works locally or remotely, i.e: using boot2docker)
+$ docker run --rm --privileged multiarch/qemu-user-static:register --reset
 ```
+
+## Build ZIP
+
+```bash
 $ make
 ```
 

chroot.shell.sh

@@ -4,8 +4,6 @@
 
 [ -f "$ROOTFS_LOCK" ] || mount_rootfs_all
 
-copy_etc_files
-
-do_chroot /bin/sh
+do_chroot su
 
 quit

chroot.shell.user.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. "$(dirname "$0")"/lib.sh
+
+[ -f "$ROOTFS_LOCK" ] || mount_rootfs_all
+
+do_chroot su -l kindle
+
+quit

e2fsprogs/Dockerfile

@@ -5,8 +5,9 @@ RUN sed -i 's|security.debian.org|mirrors.ustc.edu.cn/debian-security|g' /etc/ap
 RUN apt update
 RUN apt install -y gcc dietlibc-dev aria2 make
 RUN mkdir /src
-RUN cd /src && aria2c -k 1048576 -s 32768 -j 32768 -x 16 -k 1M http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.45.2.tar.gz
-RUN cd /src && tar -xzvf e2fsprogs-1.45.2.tar.gz
-RUN cd /src/e2fsprogs-1.45.2 && ./configure --prefix=/src --disable-threads --disable-tls --disable-nls --with-diet-libc --disable-imager --disable-debugfs --disable-defrag --disable-fuse2fs --disable-fsck --disable-e2initrd-helper
-RUN cd /src/e2fsprogs-1.45.2 && make -j4
-RUN cd /src/e2fsprogs-1.45.2 && make install
+ARG e2fsprogs_version=1.45.3
+RUN cd /src && aria2c -o e2fsprogs-${e2fsprogs_version}.tar.gz -k 1048576 -s 32768 -j 32768 -x 16 -k 1M https://kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${e2fsprogs_version}/e2fsprogs-${e2fsprogs_version}.tar.gz
+RUN cd /src && tar -xzvf e2fsprogs-${e2fsprogs_version}.tar.gz
+RUN cd /src/e2fsprogs-${e2fsprogs_version} && ./configure --prefix=/src --disable-threads --disable-tls --disable-nls --with-diet-libc --disable-imager --disable-debugfs --disable-defrag --disable-fuse2fs --disable-fsck --disable-e2initrd-helper
+RUN cd /src/e2fsprogs-${e2fsprogs_version} && make -j4
+RUN cd /src/e2fsprogs-${e2fsprogs_version} && make install

gen.menu.json.js

@@ -3,10 +3,16 @@ const kterm_scripts=
       ["LinuxDeploy",
        [["Linux",
 	 [
-	     ["Install Alpine Linux","./install.alpine.sh"],
-	     ["Shell","./chroot.shell.sh"],
+	     ["Install",[
+		 ["Alpine Linux Edge","./install.alpine.sh"],
+		 ["Ubuntu 19.04(maybe require Linux 4.x?)","./install.ubuntu.1904.sh"]]],
 	     ["Change mirror",[
 		 ["China Mainland","./mirror.china.sh"]]],
+	     ["Add a sudo-enabled user called \"kindle\"","./install.sudo.user.sh"],
+	     ["Reset \"kindle\" user's password","./set.user.password.sh"],
+	     ["Shell",[
+		 ["USER=kindle","./chroot.shell.user.sh"],
+		 ["USER=root","./chroot.shell.sh"]]],
 	     ["Umount","./umount.sh"],
 	     ["Resize rootfs","./resize.sh"],
 	     ["Remove rootfs",

install.alpine.sh

@@ -4,6 +4,17 @@
 
 [ -f "$ROOTFS_IMG" ] && fail "rootfs exist.Please remove it and continue."
 
-install_alpine_rootfs
+get_rootfs_tgz_filename(){
+    curl http://dl-cdn.alpinelinux.org/alpine/edge/releases/armhf/ |
+	grep '^<a.*"alpine-minirootfs-[0-9]*-armhf\.tar\.gz"' |
+	sed 's|^<a *href="\(.*\)">.*</a>.*$|\1|' |
+	sort |
+	tail -1
+}
+get_rootfs_tgz_url(){
+    echo "http://dl-cdn.alpinelinux.org/alpine/edge/releases/armhf/$(get_rootfs_tgz_filename)"
+}
+
+install_tgz_rootfs "$(get_rootfs_tgz_url)"
 
 quit

install.sudo.user.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. "$(dirname "$0")"/lib.sh
+
+[ -f "$ROOTFS_LOCK" ] || mount_rootfs_all
+
+if [ -f "$ROOTFS_DIR/etc/apk/repositories" ]; then
+    do_chroot apk add sudo || fail "cannot install sudo."
+elif [ -f "$ROOTFS_DIR/etc/apt/sources.list" ]; then
+    do_chroot apt update || fail "cannot install sudo."
+    do_chroot apt install -y sudo || fail "cannot install sudo."
+else
+    fail "Unsupport system."
+fi
+
+do_chroot adduser -D kindle || fail "cannot add user."
+echo "kindle ALL=(ALL) ALL" > "$ROOTFS_DIR/etc/sudoers.d/kindle" || fail
+chmod 440 "$ROOTFS_DIR/etc/sudoers.d/kindle" || fail
+do_chroot passwd kindle || fail "cannot change password.(You can safely change password later.)"
+
+quit

install.ubuntu.1904.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. "$(dirname "$0")"/lib.sh
+
+[ -f "$ROOTFS_IMG" ] && fail "rootfs exist.Please remove it and continue."
+
+install_tgz_rootfs "http://mirrors.ustc.edu.cn/ubuntu-cdimage/ubuntu-base/releases/19.04/release/ubuntu-base-19.04-base-armhf.tar.gz"
+
+quit

lib.sh

@@ -17,8 +17,6 @@ echo "
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 "
 
-cd "$(dirname "$0")"
-
 quit(){
     echo "Done. $*"
     echo "press enter to countinue."
@@ -33,6 +31,8 @@ fail(){
     exit 1
 }
 
+cd "$(dirname "$0")" || fail
+
 BIN="$(pwd)"
 ROOTFS_DIR="$(pwd)/rootfs"
 ROOTFS_IMG="$(pwd)/rootfs.img"
@@ -49,37 +49,28 @@ else
     fail "This kernel doesn't support ext4 and ext3."
 fi
 
-get_rootfs_tgz_filename(){
-    curl http://dl-cdn.alpinelinux.org/alpine/edge/releases/armhf/ |
-	grep '^<a.*"alpine-minirootfs-[0-9]*-armhf\.tar\.gz"' |
-	sed 's|^<a *href="\(.*\)">.*</a>.*$|\1|' |
-	sort |
-	tail -1
-}
-get_rootfs_tgz_url(){
-    echo "http://dl-cdn.alpinelinux.org/alpine/edge/releases/armhf/$(get_rootfs_tgz_filename)"
+copy_etc_files(){
+    [ -f "$ROOTFS_LOCK" ] || fail "rootfs is not mounted."
+    cp /etc/hostname /etc/hostname /etc/hosts /etc/resolv.conf "$ROOTFS_DIR/etc"
 }
 
 mount_rootfs_base(){
     [ -f "$ROOTFS_LOCK" ] && fail "rootfs mounted."
     touch "$ROOTFS_LOCK" || fail
     mkdir -p "$ROOTFS_DIR" || fail
     mount -o loop "$ROOTFS_IMG" "$ROOTFS_DIR" || fail "cannot mount rootfs."
+    chmod 755 "$ROOTFS_DIR" || fail
 }
 mount_rootfs_all(){
     mount_rootfs_base
+    copy_etc_files
     mkdir -p "$INNER_TMP" || fail
     mount -o bind "$INNER_TMP" "$ROOTFS_DIR/tmp" || fail "cannot bind /tmp."
     for d in /dev /dev/pts /proc /sys; do
 	mount -o bind "/$d" "$ROOTFS_DIR/$d" || fail "cannot bind $d"
     done
 }
 
-copy_etc_files(){
-    [ -f "$ROOTFS_LOCK" ] || fail "rootfs is not mounted."
-    cp /etc/hostname /etc/hostname /etc/hosts /etc/resolv.conf "$ROOTFS_DIR/etc"
-}
-
 umount_rootfs_all(){
     [ -f "$ROOTFS_LOCK" ] || fail "rootfs is not mounted."
     for d in /dev/pts /dev /proc /sys /tmp; do
@@ -96,13 +87,14 @@ resize_rootfs_interactive(){
     "$BIN"/resize2fs "$ROOTFS_IMG" "$ROOTFS_SIZE" || fail "cannot resize."
 }
 
-install_alpine_rootfs(){
+install_tgz_rootfs(){
+    local ROOTFS_TGZ_URL="$1"
     [ -f "$ROOTFS_LOCK" ] && fail "rootfs mounted."
     rm -fr "$ROOTFS_IMG" || fail
     cp rootfs."$ROOTFS_TYPE".base "$ROOTFS_IMG" || fail
     resize_rootfs_interactive
     mount_rootfs_base
-    curl "$(get_rootfs_tgz_url)" | tar -xvz -C "$ROOTFS_DIR" || fail "download and extract rootfs: failed."
+    curl "$ROOTFS_TGZ_URL" | tar -xvz -C "$ROOTFS_DIR" || fail "download and extract rootfs: failed."
     umount_rootfs_all
 }