Skip to content

Commit

Permalink
Remove /etc/host.conf from filesystem (#7389)
Browse files Browse the repository at this point in the history
  • Loading branch information
hbeberman authored and jslobodzian committed Jan 23, 2024
1 parent f85f0fc commit 014180d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions SPECS/filesystem/filesystem.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Default file system
Name: filesystem
Version: 1.1
Release: 19%{?dist}
Release: 20%{?dist}
License: GPLv3
Group: System Environment/Base
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -178,8 +178,6 @@ cat > %{buildroot}/etc/hosts <<- "EOF"

# End /etc/hosts (network card version)
EOF
# and /etc/host.conf file
echo "multi on" > %{buildroot}/etc/host.conf
#
# 7.9. Configuring the setclock Script"
#
Expand Down Expand Up @@ -607,7 +605,6 @@ return 0
%config(noreplace) /etc/fstab
%config(noreplace) /etc/group
%config(noreplace) /etc/hosts
%config(noreplace) /etc/host.conf
%config(noreplace) /etc/inputrc
%config(noreplace) /etc/mtab
%config(noreplace) /etc/passwd
Expand Down Expand Up @@ -732,6 +729,9 @@ return 0
%config(noreplace) /etc/modprobe.d/tipc.conf

%changelog
* Mon Jan 22 2024 Henry Beberman <[email protected]> - 1.1-20
- Remove /etc/host.conf due to unintended impact on the base container

* Fri Dec 08 2023 Chris Co <[email protected]> - 1.1-19
- Add scriptlet to handle /media symlink failed upgrade issue

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
filesystem-1.1-19.cm2.aarch64.rpm
filesystem-1.1-20.cm2.aarch64.rpm
kernel-headers-5.15.145.2-1.cm2.noarch.rpm
glibc-2.35-6.cm2.aarch64.rpm
glibc-devel-2.35-6.cm2.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
filesystem-1.1-19.cm2.x86_64.rpm
filesystem-1.1-20.cm2.x86_64.rpm
kernel-headers-5.15.145.2-1.cm2.noarch.rpm
glibc-2.35-6.cm2.x86_64.rpm
glibc-devel-2.35-6.cm2.x86_64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ file-5.40-2.cm2.aarch64.rpm
file-debuginfo-5.40-2.cm2.aarch64.rpm
file-devel-5.40-2.cm2.aarch64.rpm
file-libs-5.40-2.cm2.aarch64.rpm
filesystem-1.1-19.cm2.aarch64.rpm
filesystem-asc-1.1-19.cm2.aarch64.rpm
filesystem-1.1-20.cm2.aarch64.rpm
filesystem-asc-1.1-20.cm2.aarch64.rpm
findutils-4.8.0-5.cm2.aarch64.rpm
findutils-debuginfo-4.8.0-5.cm2.aarch64.rpm
findutils-lang-4.8.0-5.cm2.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ file-5.40-2.cm2.x86_64.rpm
file-debuginfo-5.40-2.cm2.x86_64.rpm
file-devel-5.40-2.cm2.x86_64.rpm
file-libs-5.40-2.cm2.x86_64.rpm
filesystem-1.1-19.cm2.x86_64.rpm
filesystem-asc-1.1-19.cm2.x86_64.rpm
filesystem-1.1-20.cm2.x86_64.rpm
filesystem-asc-1.1-20.cm2.x86_64.rpm
findutils-4.8.0-5.cm2.x86_64.rpm
findutils-debuginfo-4.8.0-5.cm2.x86_64.rpm
findutils-lang-4.8.0-5.cm2.x86_64.rpm
Expand Down

0 comments on commit 014180d

Please sign in to comment.