matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build]: Fix /proc not mounted issue (#10164)

Browse Source 
[Build]: Fix /proc not mounted issue
This commit is contained in:
xumia 2022-03-11 09:23:37 +08:00 committed by GitHub
parent f34b5e601d
commit 9cdf81230b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_debian.sh
View File

@ -67,6 +67,9 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
## ensure proc is mounted
sudo mount proc /proc -t proc || true
## make / as a mountpoint in chroot env, needed by dockerd ## make / as a mountpoint in chroot env, needed by dockerd
pushd $FILESYSTEM_ROOT pushd $FILESYSTEM_ROOT
sudo mount --bind . . sudo mount --bind . .

6
files/build_templates/sonic_debian_extension.j2
View File

@ -648,10 +648,7 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
fi fi
{% if installer_images.strip() -%} {% if installer_images.strip() -%}
clean_proc() { ## ensure proc is mounted
sudo umount /proc || true
}
trap_push clean_proc
sudo mount proc /proc -t proc || true sudo mount proc /proc -t proc || true
sudo mkdir $FILESYSTEM_ROOT/target sudo mkdir $FILESYSTEM_ROOT/target
sudo mount --bind target $FILESYSTEM_ROOT/target sudo mount --bind target $FILESYSTEM_ROOT/target
@ -732,7 +729,6 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
else else
sudo chroot $FILESYSTEM_ROOT $DOCKER_CTL_SCRIPT stop sudo chroot $FILESYSTEM_ROOT $DOCKER_CTL_SCRIPT stop
fi fi
sudo umount /proc || true
sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json" sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json"
{% for entry in feature_vs_image_names.split(' ') -%} {% for entry in feature_vs_image_names.split(' ') -%}