Skip to content

Commit 9cdf812

Browse files
authored
[Build]: Fix /proc not mounted issue (#10164)
[Build]: Fix /proc not mounted issue
1 parent f34b5e6 commit 9cdf812

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build_debian.sh

+3
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
6767
mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
6868
touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
6969

70+
## ensure proc is mounted
71+
sudo mount proc /proc -t proc || true
72+
7073
## make / as a mountpoint in chroot env, needed by dockerd
7174
pushd $FILESYSTEM_ROOT
7275
sudo mount --bind . .

files/build_templates/sonic_debian_extension.j2

+1-5
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,7 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
648648
fi
649649

650650
{% if installer_images.strip() -%}
651-
clean_proc() {
652-
sudo umount /proc || true
653-
}
654-
trap_push clean_proc
651+
## ensure proc is mounted
655652
sudo mount proc /proc -t proc || true
656653
sudo mkdir $FILESYSTEM_ROOT/target
657654
sudo mount --bind target $FILESYSTEM_ROOT/target
@@ -732,7 +729,6 @@ if [ $MULTIARCH_QEMU_ENVIRON == y ]; then
732729
else
733730
sudo chroot $FILESYSTEM_ROOT $DOCKER_CTL_SCRIPT stop
734731
fi
735-
sudo umount /proc || true
736732

737733
sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json"
738734
{% for entry in feature_vs_image_names.split(' ') -%}

0 commit comments

Comments
 (0)