@@ -30,7 +30,13 @@ PATH=$TOOLCHAIN/bin:$PATH
3030
3131
3232# Default: multiple users system
33- SINGLE_USER=${SINGLE_USER-" nodeos-boot-multiUser"
33+ if [[ " $SINGLE_USER " ; then
34+ OUT_NAME=${CPU} _${SINGLE_USER}
35+ else
36+ OUT_NAME=${CPU}
37+ 38+ SINGLE_USER=nodeos-boot-multiUser
39+ fi
3440
3541
3642#
@@ -39,8 +45,8 @@ SINGLE_USER=${SINGLE_USER-"nodeos-boot-multiUser"}
3945
4046NODE_PLATFORM=linux
4147
42- OBJ_DIR= $OBJECTS - $SINGLE_USER
43- OUT_DIR= ` pwd ` /out/ $CPU - $ SINGLE_USER
48+ OUT_DIR= ` pwd ` /out/ $OUT_NAME
49+ OBJ_DIR= ${OBJECTS} _ ${ SINGLE_USER}
4450PREBUILD=prebuilds/$NODE_PLATFORM -$NODE_ARCH .tar.gz
4551
4652
@@ -87,14 +93,6 @@ if [[ ! -d $STEP_DIR ]]; then
8793 # Install system init
8894 #
8995
90- # Empty, single user system with `$HOME` in another partition
91- # TODO `OverlayFS` require workdir and upperdir must be separate subtrees, so
92- # maybe it's a non-sense and should use a `multiUser` partition with a single
93- # folder instead... what's ugly for pendrives :-(
94- if [[ -z " $SINGLE_USER " ; then
95- SINGLE_USER=nodeos-boot-singleUserMount
96- fi
97- 9896 eval " $NPMi " $SINGLE_USER --has_libblkid=false \
9997 --fuse__include_dirs=$SRC_FUSE /include/fuse \
10098 --fuse__library_dirs=$SRC_FUSE /lib \
@@ -140,14 +138,15 @@ if [[ ! -f $STEP_DIR ]]; then
140138 mkdir -p ` dirname $STEP_DIR `
141139
142140 (
143- # TODO with `nodeos-boot-singleUser`, set user files user:group to `1:1`.
144- # This would require to set the global ones to `0:0` before installing them
141+ # TODO on single user systems, set user files user:group to `1:1`. This
142+ # would require to set the global ones to `0:0` before adding the user ones.
143+ # Other option is to use the npm `cpio-stream`module
145144 cd " $OBJ_DIR " &&
146145 find | cpio --owner 0:0 -o -H newc | gzip || exit 40
147146 ) > $STEP_DIR || err $?
148147fi
149148
150- ln -sf $CPU - $SINGLE_USER out/latest || err 41
149+ ln -sf $OUT_NAME out/latest || err 41
151150
152151
153152echo -e " ${GRN} Successfully built 'initramfs'${CLR} "
@@ -161,5 +160,5 @@ echo -e "${GRN}Successfully built 'initramfs'${CLR}"
161160
162161STEP_DIR=$PREBUILD
163162
164- mkdir -p ` dirname $STEP_DIR ` &&
165- tar -cf - out/$CPU - $SINGLE_USER out/latest | gzip > $STEP_DIR || err 50
163+ mkdir -p ` dirname $STEP_DIR ` &&
164+ tar -cf - out/$OUT_NAME out/latest | gzip > $STEP_DIR || err 50
0 commit comments