Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 3f30248

Browse files
committed
Get usersfs partition using UUID instead of hardcoded device
1 parent cbece22 commit 3f30248

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

‎resources/syslinux.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ DEFAULT NodeOS
22
LABEL NodeOS
33
SAY Booting NodeOS...
44
LINUX kernel.img
5-
APPEND root=/dev/sdb2 vga=0x318 ip=dhcp
65
INITRD initram.gz
6+
APPEND vga=0x318 ip=dhcp root=$USERSFS

‎scripts/build

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CLR="\e[0m"
1414
__dirname=`dirname "$(readlink -f "0ドル")"`
1515

1616

17-
while getopts ":B:F:I:K:O:" opt; do
17+
while getopts ":B:F:I:K:O:U:" opt; do
1818
case $opt in
1919
B)
2020
BAREBONES="$OPTARG" # Location of the barebones image
@@ -35,6 +35,10 @@ while getopts ":B:F:I:K:O:" opt; do
3535
O)
3636
OUTPUT="$OPTARG" # Output location
3737
;;
38+
39+
U)
40+
USERSFS="$OPTARG" # Usersfs location to be mounted from
41+
;;
3842
esac
3943
done
4044

@@ -43,6 +47,10 @@ if [[ -z "$OUTPUT" ]]; then
4347
exit 1
4448
fi
4549

50+
if [[ "$USERSFS" ]]; then
51+
USERSFS=`blkid $USERSFS -o export | grep UUID`
52+
fi
53+
4654

4755
TOOLCHAIN=`node -p "require('nodeos-cross-toolchain')"`
4856

@@ -103,7 +111,7 @@ function createEfiImage() {
103111

104112
# Copy SysLinux files
105113

106-
cp $__dirname/../resources/syslinux.cfg $STEP_DIR || exit 31
114+
eval"echo \"(<$__dirname/../resources/syslinux.cfg)\""> $STEP_DIR || exit 31
107115

108116
cp $SRC_DIR/efi$BITS/efi/syslinux.efi \
109117
$SRC_DIR/efi$BITS/com32/elflink/ldlinux/ldlinux.e$BITS \
@@ -125,8 +133,8 @@ function createEfiImage() {
125133
}
126134

127135
function createIsoImage() {
128-
mkdir -p $STEP_DIR &&
129-
cp $__dirname/../resources/syslinux.cfg $STEP_DIR || exit 40
136+
mkdir -p $STEP_DIR &&
137+
eval"echo \"(<$__dirname/../resources/syslinux.cfg)\""> $STEP_DIR || exit 40
130138

131139
# Create EFI boot image
132140
createEfiImage || exit $?
@@ -175,7 +183,7 @@ case $MACHINE in
175183

176184
# Copy SysLinux files
177185

178-
cp $__dirname/../resources/syslinux.cfg$STEP_DIR || err 71
186+
eval"echo \"(<$__dirname/../resources/syslinux.cfg)\"">$STEP_DIR || exit 71
179187

180188
createPartitionImage || exit $?
181189

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /