From 2b68aff8fefa46cc0189f4b91a52c89f7bf489bd Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 8 May 2019 23:58:27 +0200 Subject: [PATCH] - skel-root/hd51: add partitions-by-name and resizerootfs --- make/system-tools.mk | 11 ++++++- .../armbox/hd51/etc/init.d/partitions-by-name | 16 ++++++++++ skel-root/armbox/hd51/etc/init.d/rcS | 3 ++ skel-root/armbox/hd51/etc/init.d/resizerootfs | 30 +++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100755 skel-root/armbox/hd51/etc/init.d/partitions-by-name create mode 100755 skel-root/armbox/hd51/etc/init.d/resizerootfs diff --git a/make/system-tools.mk b/make/system-tools.mk index 552739db..5c9f070a 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -507,20 +507,29 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGET_DIR) $(CONFIGURE) \ --target=$(TARGET) \ --prefix=/ \ + --datarootdir=/.remove \ --infodir=/.remove \ --mandir=/.remove \ --disable-nls \ --disable-profile \ --disable-e2initrd-helper \ + --disable-backtrace \ + --disable-bmap-stats \ --disable-debugfs \ + --disable-fuse2fs \ --disable-imager \ - --disable-resizer \ + --disable-mmp \ + --disable-rpath \ + --disable-tdb \ --disable-uuidd \ + --disable-blkid-debug \ + --disable-jbd-debug \ --disable-testio-debug \ --disable-defrag \ --enable-elf-shlibs \ --enable-fsck \ --enable-symlink-install \ + --enable-verbose-makecmds \ --enable-symlink-build \ --with-gnu-ld \ ; \ diff --git a/skel-root/armbox/hd51/etc/init.d/partitions-by-name b/skel-root/armbox/hd51/etc/init.d/partitions-by-name new file mode 100755 index 00000000..48570e19 --- /dev/null +++ b/skel-root/armbox/hd51/etc/init.d/partitions-by-name @@ -0,0 +1,16 @@ +#!/bin/sh +if grep -q mmcblk1 /proc/cmdline +then + search=/sys/block/mmcblk1/mmcblk1p* +else + search=/sys/block/mmcblk0/mmcblk0p* +fi +for i in $search; +do + if [ "$i" != "$search" ]; then + partname=`cat /$i/uevent | grep PARTNAME | cut -d '=' -f 2` + devname=`cat /$i/uevent | grep DEVNAME | cut -d '=' -f 2` + mkdir -p /dev/block/by-name/ + ln -sf /dev/$devname /dev/block/by-name/$partname + fi +done diff --git a/skel-root/armbox/hd51/etc/init.d/rcS b/skel-root/armbox/hd51/etc/init.d/rcS index b7bae075..2c0c2135 100755 --- a/skel-root/armbox/hd51/etc/init.d/rcS +++ b/skel-root/armbox/hd51/etc/init.d/rcS @@ -25,6 +25,9 @@ mkdir -p /dev/shm/usb # mount var-partition # FIXME +service partitions-by-name start +service resizerootfs start + # for nfsd mkdir -p /var/lib/nfs mount -t tmpfs nfs /var/lib/nfs diff --git a/skel-root/armbox/hd51/etc/init.d/resizerootfs b/skel-root/armbox/hd51/etc/init.d/resizerootfs new file mode 100755 index 00000000..5adee740 --- /dev/null +++ b/skel-root/armbox/hd51/etc/init.d/resizerootfs @@ -0,0 +1,30 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: resize2fs mmcblk0p3 +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: S +# Default-Stop: +# Short-Description: Resizes once linuxrootfs and userdata to full partition size +### END INIT INFO + +if [ ! -f "/.resize-linuxrootfs" ] & [ -e "/dev/block/by-name/linuxrootfs" ] + then + echo "Resizing linuxrootfs partition, Do not unplug power!..." + resize2fs /dev/block/by-name/linuxrootfs + touch "/.resize-linuxrootfs" +fi + +if [ ! -f "/.resize-userdata" ] & [ -e "/dev/block/by-name/userdata" ] & [ -e "/sbin/blkid" ]; then + if blkid /dev/block/by-name/userdata | grep "ext4"; then + echo "Resizing userdata partition, Do not unplug power!..." + resize2fs /dev/block/by-name/userdata + touch "/.resize-userdata" + else + echo "userdata partition is not format!..." + echo "Setup userdata partitions, Do not unplug power!..." + mkfs.ext4 -F /dev/block/by-name/userdata + touch "/.resize-userdata" + fi +fi +: exit 0