Skip to content

Commit 014180d

Browse files
hbebermanjslobodzian
authored andcommitted
Remove /etc/host.conf from filesystem (#7389)
1 parent f85f0fc commit 014180d

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

SPECS/filesystem/filesystem.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: Default file system
22
Name: filesystem
33
Version: 1.1
4-
Release: 19%{?dist}
4+
Release: 20%{?dist}
55
License: GPLv3
66
Group: System Environment/Base
77
Vendor: Microsoft Corporation
@@ -178,8 +178,6 @@ cat > %{buildroot}/etc/hosts <<- "EOF"
178178

179179
# End /etc/hosts (network card version)
180180
EOF
181-
# and /etc/host.conf file
182-
echo "multi on" > %{buildroot}/etc/host.conf
183181
#
184182
# 7.9. Configuring the setclock Script"
185183
#
@@ -607,7 +605,6 @@ return 0
607605
%config(noreplace) /etc/fstab
608606
%config(noreplace) /etc/group
609607
%config(noreplace) /etc/hosts
610-
%config(noreplace) /etc/host.conf
611608
%config(noreplace) /etc/inputrc
612609
%config(noreplace) /etc/mtab
613610
%config(noreplace) /etc/passwd
@@ -732,6 +729,9 @@ return 0
732729
%config(noreplace) /etc/modprobe.d/tipc.conf
733730

734731
%changelog
732+
* Mon Jan 22 2024 Henry Beberman <henry.beberman@microsoft.com> - 1.1-20
733+
- Remove /etc/host.conf due to unintended impact on the base container
734+
735735
* Fri Dec 08 2023 Chris Co <chrco@microsoft.com> - 1.1-19
736736
- Add scriptlet to handle /media symlink failed upgrade issue
737737

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
filesystem-1.1-19.cm2.aarch64.rpm
1+
filesystem-1.1-20.cm2.aarch64.rpm
22
kernel-headers-5.15.145.2-1.cm2.noarch.rpm
33
glibc-2.35-6.cm2.aarch64.rpm
44
glibc-devel-2.35-6.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
filesystem-1.1-19.cm2.x86_64.rpm
1+
filesystem-1.1-20.cm2.x86_64.rpm
22
kernel-headers-5.15.145.2-1.cm2.noarch.rpm
33
glibc-2.35-6.cm2.x86_64.rpm
44
glibc-devel-2.35-6.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ file-5.40-2.cm2.aarch64.rpm
8181
file-debuginfo-5.40-2.cm2.aarch64.rpm
8282
file-devel-5.40-2.cm2.aarch64.rpm
8383
file-libs-5.40-2.cm2.aarch64.rpm
84-
filesystem-1.1-19.cm2.aarch64.rpm
85-
filesystem-asc-1.1-19.cm2.aarch64.rpm
84+
filesystem-1.1-20.cm2.aarch64.rpm
85+
filesystem-asc-1.1-20.cm2.aarch64.rpm
8686
findutils-4.8.0-5.cm2.aarch64.rpm
8787
findutils-debuginfo-4.8.0-5.cm2.aarch64.rpm
8888
findutils-lang-4.8.0-5.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ file-5.40-2.cm2.x86_64.rpm
8181
file-debuginfo-5.40-2.cm2.x86_64.rpm
8282
file-devel-5.40-2.cm2.x86_64.rpm
8383
file-libs-5.40-2.cm2.x86_64.rpm
84-
filesystem-1.1-19.cm2.x86_64.rpm
85-
filesystem-asc-1.1-19.cm2.x86_64.rpm
84+
filesystem-1.1-20.cm2.x86_64.rpm
85+
filesystem-asc-1.1-20.cm2.x86_64.rpm
8686
findutils-4.8.0-5.cm2.x86_64.rpm
8787
findutils-debuginfo-4.8.0-5.cm2.x86_64.rpm
8888
findutils-lang-4.8.0-5.cm2.x86_64.rpm

0 commit comments

Comments
 (0)