Skip to content

Commit 3f3eb8f

Browse files
committed
no apt-get; don't use "user" before user is created
- hit these on hyperstack
1 parent 577fd92 commit 3f3eb8f

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/packages/server/compute/cloud/install.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,10 @@ echo '${auth}' > /cocalc/conf/authorized_keys
328328
echo '${auth_token}' > ${PROXY_AUTH_TOKEN_FILE}
329329
echo '${base64ProxyConfig}' | base64 --decode > ${PROXY_CONFIG}
330330
echo '${exclude_from_sync}' > /cocalc/conf/exclude_from_sync
331-
chown user:user -R /cocalc/conf
331+
chown ${UID}:${UID} -R /cocalc/conf
332332
`;
333+
334+
// have to use UID instead of "user" since user possibly isn't created yet.
333335
}
334336

335337
/*

src/packages/server/compute/cloud/startup-script.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ ${defineSetStateFunction({ api_key, apiServer, compute_server_id })}
147147
148148
setState state running
149149
150+
# make sure nothing involving apt-get is running (e.g., auto updates)
151+
pkill -9 apt-get || true
152+
150153
${installTime()}
151154
152155
setState install configure '' 60 10
@@ -354,7 +357,7 @@ fi
354357
# keys and move data.
355358
356359
mkdir -p /data
357-
chown user:user /data
360+
chown 2001:2001 /data
358361
359362
docker stop filesystem >/dev/null 2>&1
360363
docker rm filesystem >/dev/null 2>&1
@@ -364,7 +367,7 @@ setState filesystem run '' 45 25
364367
export TOTAL_RAM=$(free -g |grep Mem: | awk '{print $2}')
365368
366369
mkdir -p /ephemeral
367-
chown user:user /ephemeral
370+
chown 2001:2001 /ephemeral
368371
docker run \
369372
-d \
370373
--name=filesystem \
@@ -445,7 +448,7 @@ if [ $? -ne 0 ]; then
445448
setState compute run '' 20 25
446449
export TOTAL_RAM=$(free -g |grep Mem: | awk '{print $2}')
447450
mkdir -p /ephemeral
448-
chown user:user /ephemeral
451+
chown 2001:2001 /ephemeral
449452
docker run -d ${gpu ? GPU_FLAGS : ""} \
450453
--name=compute \
451454
--network host \

0 commit comments

Comments
 (0)