Commit 19ade37

committed

Generate independent images for single user

1 parent 14997cc commit 19ade37Copy full SHA for 19ade37

File tree

1 file changed

+15

-14

lines changed

scripts
- build

1 file changed

+15

-14

lines changed

`‎scripts/build`

Lines changed: 15 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,18 @@ PATH=$TOOLCHAIN/bin:$PATH`
`29`	`29`	`) \|\| exit $?`
`30`	`30`
`31`	`31`
	`32`	`+# Default: multiple users system`
	`33`	`+SINGLE_USER=${SINGLE_USER-"nodeos-boot-multiUser"}`
	`34`	`+`
	`35`	`+`
`32`	`36`	`#`
`33`	`37`	`# Define steps paths`
`34`	`38`	`#`
`35`	`39`
`36`	`40`	`NODE_PLATFORM=linux`
`37`	`41`
`38`		-OUT_DIR=`pwd`/out/$CPU
	`42`	`+OBJ_DIR=$OBJECTS-$SINGLE_USER`
	`43`	+OUT_DIR=`pwd`/out/$CPU-$SINGLE_USER
`39`	`44`	`PREBUILD=prebuilds/$NODE_PLATFORM-$NODE_ARCH.tar.gz`
`40`	`45`
`41`	`46`
`@@ -46,15 +51,15 @@ PREBUILD=prebuilds/$NODE_PLATFORM-$NODE_ARCH.tar.gz`
`46`	`51`	SRC_FUSE=`node -p "require('libfuse')"`
`47`	`52`
`48`	`53`	`(`
`49`		`- cd $SRC_FUSE && eval "$NPMi" \|\| exit 11`
	`54`	`+ cd $SRC_FUSE && eval "$NPMi" \|\| exit 10`
`50`	`55`	`) \|\| err $?`
`51`	`56`
`52`	`57`
`53`	`58`	`#`
`54`	`59`	`# System dependencies`
`55`	`60`	`#`
`56`	`61`
`57`		`-STEP_DIR=$OBJECTS`
	`62`	`+STEP_DIR=$OBJ_DIR`
`58`	`63`
`59`	`64`	`if [[ ! -d $STEP_DIR ]]; then`
`60`	`65`	`echo -e "${WHT}Generating initramfs${CLR}"`
`@@ -82,10 +87,6 @@ if [[ ! -d $STEP_DIR ]]; then`
`82`	`87`	`# Install system init`
`83`	`88`	`#`
`84`	`89`
`85`		`- # Default: multiple users system`
`86`		`- SINGLE_USER=${SINGLE_USER-"nodeos-boot-multiUser"}`
`87`		`- echo SINGLE_USER: \"$SINGLE_USER\"`
`88`		`-`
`89`	`90`	# Empty, single user system with `$HOME` in another partition
`90`	`91`	`if [[ -z "$SINGLE_USER" ]]; then`
`91`	`92`	`INIT=nodeos-boot-singleUserMount`
`@@ -129,22 +130,22 @@ fi`
`129`	`130`	`STEP_DIR=$OUT_DIR`
`130`	`131`
`131`	`132`	`# Set initramfs files only accesible to root`
`132`		`-chmod -R u-w,go-rw "$OBJECTS" &&`
`133`		`-chmod -R o+r "$OBJECTS/lib/node_modules/usrbinenv" &&`
`134`		`-chmod -R o+r "$OBJECTS/usr/bin/env" \|\| exit 30`
	`133`	`+chmod -R u-w,go-rw "$OBJ_DIR" &&`
	`134`	`+chmod -R o+r "$OBJ_DIR/lib/node_modules/usrbinenv" &&`
	`135`	`+chmod -R o+r "$OBJ_DIR/usr/bin/env" \|\| exit 30`
`135`	`136`
`136`	`137`	`if [[ ! -f $STEP_DIR ]]; then`
`137`	`138`	`rmStep $PREBUILD`
`138`	`139`
`139`	`140`	mkdir -p `dirname $STEP_DIR`
`140`	`141`
`141`	`142`	`(`
`142`		`- cd "$OBJECTS" &&`
	`143`	`+ cd "$OBJ_DIR" &&`
`143`	`144`	`find \| cpio --owner 0:0 -o -H newc \| gzip \|\| exit 40`
`144`	`145`	`) > $STEP_DIR \|\| err $?`
`145`	`146`	`fi`
`146`	`147`
`147`		`-ln -sf $CPU out/latest \|\| err 41`
	`148`	`+ln -sf $CPU-$SINGLE_USER out/latest \|\| err 41`
`148`	`149`
`149`	`150`
`150`	`151`	`echo -e "${GRN}Successfully built 'initramfs'${CLR}"`
`@@ -158,5 +159,5 @@ echo -e "${GRN}Successfully built 'initramfs'${CLR}"`
`158`	`159`
`159`	`160`	`STEP_DIR=$PREBUILD`
`160`	`161`
`161`		-mkdir -p `dirname $STEP_DIR` &&
`162`		`-tar -cf - out/$CPU out/latest \| gzip > $STEP_DIR \|\| err 100`
	`162`	+mkdir -p `dirname $STEP_DIR` &&
	`163`	`+tar -cf - out/$CPU-$SINGLE_USER out/latest \| gzip > $STEP_DIR \|\| err 50`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 19ade37

File tree

1 file changed

1 file changed

`‎scripts/build`

0 commit comments