Some rootfs restructuring

- Dedicate home directory for root user (classic /root)
 - Root homedirectory is overlay mounted
 - Allows us to have an empty user directory that we directly
   mount, i.e. without using overlay fs

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>

pkg/base-files/build

@@ -8,11 +8,11 @@ deploy() {
 	local DEPLOY="$3"
 
 	# home directory of root user
-	mkdir -p "$DEPLOY/usr/root"
+	mkdir -p "$DEPLOY/root"
-	chmod 750 "$DEPLOY/usr/root"
+	chmod 750 "$DEPLOY/root"
 
-	cp "$SCRIPTDIR/pkg/base-files/bash_profile" "$DEPLOY/usr/root/.bash_profile"
+	cp "$SCRIPTDIR/pkg/base-files/bash_profile" "$DEPLOY/root/.bash_profile"
-	cp "$SCRIPTDIR/pkg/base-files/bashrc" "$DEPLOY/usr/root/.bashrc"
+	cp "$SCRIPTDIR/pkg/base-files/bashrc" "$DEPLOY/root/.bashrc"
 
 	# /etc base files
 	mkdir -p "$DEPLOY/etc/skel"

pkg/base-files/passwd

@@ -1 +1 @@
-root:x:0:0:root:/usr/root:/bin/bash
+root:x:0:0:root:/root:/bin/bash

pkg/initrd/initrd.skel

@@ -96,9 +96,11 @@ if [ ! -z "$overlay_dev" ]; then
 
 	overlay_mount "cfg/preserve/etc" "cfg/overlay/etc" "etc"
 	overlay_mount "cfg/preserve/var_lib" "cfg/overlay/var_lib" "var/lib"
+	overlay_mount "cfg/preserve/root" "cfg/overlay/root" "root"
 else
 	bind_mount "cfg/preserve/etc" "etc"
 	bind_mount "cfg/preserve/var_lib" "var/lib"
+	bind_mount "cfg/preserve/root" "root"
 fi
 
 # cleanup mounts

pkg/release-alix/genimage.sh

@@ -47,6 +47,7 @@ mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
+mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
 umount /tmp/mnt.$$
 MOUNTED=0
 

pkg/release-alix/install.sh

@@ -57,6 +57,7 @@ mount -t btrfs ${DEVICE}2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
+mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
 umount /tmp/mnt.$$
 MOUNTED=0
 

pkg/release-rpi3/genimage.sh

@@ -44,6 +44,7 @@ mount -t btrfs ${LODEV}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
+mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
 umount /tmp/mnt.$$
 MOUNTED=0
 

pkg/release-rpi3/install.sh

@@ -54,6 +54,7 @@ mount -t btrfs ${DEVICE}p2 /tmp/mnt.$$
 MOUNTED=1
 mkdir /tmp/mnt.$$/etc /tmp/mnt.$$/etc_work
 mkdir /tmp/mnt.$$/var_lib /tmp/mnt.$$/var_lib_work
+mkdir /tmp/mnt.$$/root /tmp/mnt.$$/root_work
 umount /tmp/mnt.$$
 MOUNTED=0
 

pkg/rootfs-alix/build

@@ -30,6 +30,10 @@ build() {
 	mkdir -p ${BUILD}/etc
 
 	mv ${BUILD}/var/lib ${BUILD}/cfg/preserve/var_lib
+
+	mv ${BUILD}/root ${BUILD}/cfg/preserve
+	mkdir -p ${BUILD}/root
+	chmod 750 ${BUILD}/root
 }
 
 deploy() {

pkg/rootfs-rpi3/build

@@ -31,6 +31,10 @@ build() {
 	mkdir -p ${BUILD}/etc
 
 	mv ${BUILD}/var/lib ${BUILD}/cfg/preserve/var_lib
+
+	mv ${BUILD}/root ${BUILD}/cfg/preserve
+	mkdir -p ${BUILD}/root
+	chmod 750 ${BUILD}/root
 }
 
 deploy() {